Created
April 22, 2015 09:36
-
-
Save duythinht/3430bbbdc0748923b1d8 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[user] | |
name = Thinh Tran | |
email = [email protected] | |
[push] | |
default = current | |
[core] | |
excludesfile = /Users/duythinht/.gitignore_global | |
editor = /usr/bin/vim | |
[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 | |
[branch] | |
autosetuprebase = always | |
[color] | |
ui = true | |
[merge] | |
tool = p4merge | |
keepBackup = false | |
[mergetool "p4merge"] | |
cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED" | |
keepTemporaties = false | |
trustExitCode = false | |
keepBackup = false | |
[diff] | |
tool = p4merge | |
external = p4diff | |
[difftool "p4merge"] | |
cmd = p4merge $LOCAL $REMOTE |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment