Add Kaleidoscope configuration
Kaleidoscope is a diff tool. Add configuration for it and a shortcut to run it `git dkal`
This commit is contained in:
@@ -74,6 +74,9 @@
|
||||
aa = !git ls-files -d | xargs git rm && git ls-files -m -o --exclude-standard | xargs git add
|
||||
# remove grep - Remove found files that are NOT under version control
|
||||
rg = "!sh -c 'git ls-files --others --exclude-standard | grep $1 | xargs rm' -"
|
||||
|
||||
# Kaleidoscope commands
|
||||
dkal = difftool -y -t Kaleidoscope
|
||||
[color]
|
||||
diff = auto
|
||||
status = auto
|
||||
@@ -122,3 +125,8 @@
|
||||
lineNumber = true
|
||||
[credential]
|
||||
helper = osxkeychain
|
||||
[difftool "Kaleidoscope"]
|
||||
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
|
||||
[mergetool "Kaleidoscope"]
|
||||
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
|
||||
trustexitcode = true
|
||||
|
||||
Reference in New Issue
Block a user