Skip to content

Commit f79889a

Browse files
committed
Remove Kaleidoscope Git tools
1 parent d9f1136 commit f79889a

1 file changed

Lines changed: 0 additions & 29 deletions

File tree

dotfiles/.gitconfig

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,8 @@
112112
changed = green
113113
untracked = cyan
114114

115-
[difftool "Kaleidoscope"]
116-
117-
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
118-
119115
[diff]
120116

121-
tool = Kaleidoscope
122117
# Detect copies as well as renames
123118
renames = copies
124119
colorMoved = default
@@ -127,19 +122,6 @@
127122
# Use `hexdump` to diff binary files
128123
textconv = hexdump -v -C
129124

130-
[difftool]
131-
132-
prompt = false
133-
134-
[mergetool "Kaleidoscope"]
135-
136-
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
137-
trustExitCode = true
138-
139-
[mergetool]
140-
141-
prompt = false
142-
143125
[help]
144126

145127
# Automatically correct and execute mistyped commands
@@ -149,7 +131,6 @@
149131

150132
# Include summaries of merged commits in newly created merge commit messages
151133
log = true
152-
tool = Kaleidoscope
153134
conflictstyle = zdiff3
154135

155136
[pull]
@@ -203,13 +184,3 @@
203184
[commit]
204185
# Default to unsigned commits (you can still sign per-commit with -S)
205186
gpgsign = false
206-
207-
# Sourcetree specific
208-
209-
[difftool "sourcetree"]
210-
cmd = /opt/homebrew/bin/ksdiff -w \"$LOCAL\" \"$REMOTE\"
211-
path =
212-
213-
[mergetool "sourcetree"]
214-
cmd = /opt/homebrew/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
215-
trustExitCode = true

0 commit comments

Comments
 (0)