Mercurial > dotfiles
comparison git/gitconfig @ 401:4cbf9f8b4a37
SCM config tweaks.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Sun, 10 Dec 2017 21:42:47 -0800 |
parents | ff48d206d1f1 |
children | f464cf177151 |
comparison
equal
deleted
inserted
replaced
400:d5f9ce3c3c91 | 401:4cbf9f8b4a37 |
---|---|
1 [user] | 1 [user] |
2 name = Ludovic Chabant | 2 name = Ludovic Chabant |
3 email = ludovic@chabant.com | 3 email = ludovic@chabant.com |
4 | 4 |
5 [push] | 5 [push] |
6 default = simple | 6 default = simple |
7 | 7 |
8 [alias] | 8 [alias] |
16 cmd = opendiff \"$LOCAL\" \"$REMOTE\" | 16 cmd = opendiff \"$LOCAL\" \"$REMOTE\" |
17 path = | 17 path = |
18 [mergetool "sourcetree"] | 18 [mergetool "sourcetree"] |
19 cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" | 19 cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" |
20 trustExitCode = true | 20 trustExitCode = true |
21 [core] | |
22 excludesfile = /Users/abdul/.gitignore_global | |
23 [commit] | |
24 template = /Users/abdul/.stCommitMsg |