Permalink
Browse files

Added some diff tools.

  • Loading branch information...
1 parent 8b4904d commit 57d6f925597cc0f1d7613951f6ae81a8bc8b5732 @hopsoft committed Apr 17, 2012
Showing with 7 additions and 2 deletions.
  1. +7 −2 .gitconfig
View
9 .gitconfig
@@ -17,8 +17,13 @@
[core]
excludesfile = $HOME/.gitignore
[difftool "opendiff"]
- cmd = opendiff
- path = /usr/bin/opendiff
+ cmd = /usr/bin/opendiff $LOCAL $REMOTE
[mergetool "opendiff"]
+ cmd = /usr/bin/opendiff $LOCAL $REMOTE -ancestor $BASE -merge $MERGED
+ trustExitCode = true
+[difftool "sourcetree"]
+ cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+ path =
+[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true

0 comments on commit 57d6f92

Please sign in to comment.