Update gitconfig, merge/difftools + keepBackup=false

http://stackoverflow.com/questions/1251681/diff-tool-generates-unwanted-orig-files
tgwizard · Mar 12, 2014 · a784a2e · a784a2e
1 parent 9616ae2
commit a784a2e
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/git/gitconfig b/git/gitconfig
@@ -44,3 +44,20 @@
 	changed = green
 	untracked = cyan
 
+[diff]
+	tool = bc3
+[difftool "Kaleidoscope"]
+	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
+[difftool]
+	prompt = false
+	bc3 = trustExitCode
+[merge]
+	tool = bc3
+[mergetool]
+	prompt = false
+	keepBackup = false
+[mergetool "Kaleidoscope"]
+	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+	trustExitCode = true
+[mergetool "bc3"]
+	trustExitCode = true