[git] Add icdiff as a difftool

pull/28/head
Alpha Chen 10 years ago
parent 1590de7117
commit e0468b9bfe

@ -22,9 +22,10 @@
s = status -sb s = status -sb
latest = for-each-ref --count=20 --sort=-committerdate --format='%(committerdate:short) %(refname:short)' latest = for-each-ref --count=20 --sort=-committerdate --format='%(committerdate:short) %(refname:short)'
root = !pwd root = !pwd
[difftool]
prompt = false
[difftool "sourcetree"] [difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\" cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"] [mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true trustExitCode = true
@ -35,6 +36,8 @@
[mergetool "kaleidoscope"] [mergetool "kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true trustExitCode = true
[difftool "icdiff"]
cmd = icdiff --line-numbers --no-bold \"$LOCAL\" \"$REMOTE\"
[grep] [grep]
extendRegexp = true extendRegexp = true
lineNumber = true lineNumber = true
@ -49,6 +52,7 @@
templatedir = /Users/alpha/.git_templates templatedir = /Users/alpha/.git_templates
[diff] [diff]
algorithm = patience algorithm = patience
tool = icdiff
[fetch] [fetch]
prune = true prune = true
[tag] [tag]

Loading…
Cancel
Save