Mercurial > dotfiles

annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
454
54bdd1f0f873 Make OS-specific configs for Git.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
1
54bdd1f0f873 Make OS-specific configs for Git.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
2 [difftool "sourcetree"]
54bdd1f0f873 Make OS-specific configs for Git.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
3 cmd = opendiff \"$LOCAL\" \"$REMOTE\"
54bdd1f0f873 Make OS-specific configs for Git.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
4 path =
54bdd1f0f873 Make OS-specific configs for Git.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
5 [mergetool "sourcetree"]
54bdd1f0f873 Make OS-specific configs for Git.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
6 cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
54bdd1f0f873 Make OS-specific configs for Git.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
7 trustExitCode = true
54bdd1f0f873 Make OS-specific configs for Git.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
8
54bdd1f0f873 Make OS-specific configs for Git.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
9 # vim:ft=gitconfig:ts=2:sw=2