SourceTree is fiddling with my gitignore file again

user36634 · Mar 26, 2013 · 2138640 · 2138640
1 parent c608708
commit 2138640
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/gitconfig b/gitconfig
@@ -4,7 +4,7 @@
 [github]
     user = user36634
 [core]
-	excludesfile = ~/.gitignore
+	excludesfile = /Users/Dondi/.gitignore
 	editor = "vim"
 	quotepath = false
 [branch]
@@ -31,7 +31,7 @@
 	cmd = /usr/local/bin/ksdiff -w \"$LOCAL\" \"$REMOTE\"
 	path = 
 [mergetool "sourcetree"]
-	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
 	trustExitCode = true
 [credential]
 	helper = osxkeychain