Permalink
Browse files

Add .gitconfig modifications from sourcetree

  • Loading branch information...
1 parent 4d55261 commit 5c20243aa4e99b4771c99d501e38434aea12194e @leto committed Feb 2, 2013
Showing with 7 additions and 2 deletions.
  1. +7 −2 config/.gitconfig
View
@@ -50,7 +50,7 @@
pull-all-submodules = submodule foreach "git checkout master && git pull origin master"
[core]
- excludesfile = ~/.gitignore
+ excludesfile = ~/.gitignore_global
editor = vim
pager = less -FXRS
filemode = true
@@ -91,7 +91,6 @@
changed = green
untracked = cyan
-
[push]
default = current
@@ -111,3 +110,9 @@
stat = 1
[github]
user = leto
+[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 5c20243

Please sign in to comment.