[user] name = Evan Reynolds email = evan@evan.org [ssh] key = /Users/evanreynolds/.ssh/id_rsa.pub [core] excludesfile = /Users/evanreynolds/.gitignore_global [mergetool "p4merge"] cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "\"$PWD/$BASE\"" "\"$PWD/$REMOTE\"" "\"$PWD/$LOCAL\"" "\"$PWD/$MERGED\"" keepTemporaries = false trustExitCode = false keepBackup = false [difftool "p4merge"] cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge \"$LOCAL\" \"$REMOTE\" keepTemporaries = false trustExitCode = false keepBackup = false [difftool "sourcetree"] cmd = /Applications/p4merge.app/Contents/MacOS/p4merge \"$LOCAL\" \"$REMOTE\" path = [mergetool "sourcetree"] cmd = /Applications/p4merge.app/Contents/MacOS/p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" trustExitCode = true [credential] helper = osxkeychain [alias] br = branch ca = commit --amend ci = commit cp = cherry-pick co = checkout fp = fetch --prune mf = merge --ff-only mnf = merge --no-ff pf = pull --ff-only rb = rebase rba = rebase --abort rbc = rebase --continue st = status [merge] tool = p4merge [diff] tool = p4merge