Mercurial > dotfiles

diff git/gitconfig-MacOSX @ 454:54bdd1f0f873

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make OS-specific configs for Git.
author Ludovic Chabant <ludovic@chabant.com>
date Tue, 13 Nov 2018 09:55:24 -0800
parents
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/git/gitconfig-MacOSX	Tue Nov 13 09:55:24 2018 -0800
@@ -0,0 +1,9 @@
+
+[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
+
+# vim:ft=gitconfig:ts=2:sw=2