Skip to content

Instantly share code, notes, and snippets.

@WilbertOnGithub
Created December 7, 2012 07:38
Show Gist options
  • Save WilbertOnGithub/4231531 to your computer and use it in GitHub Desktop.
Save WilbertOnGithub/4231531 to your computer and use it in GitHub Desktop.
gitconfig file that shows how to configure P4Merge
[merge]
tool = p4merge
log = true
[user]
name =
email =
[core]
editor = vim
autocrlf = true
safecrlf = false
hideDotFiles = false
whitespace = cr-at-eol
filemode = false
[mergetool "p4merge"]
path = C:/Program Files/Perforce/p4merge.exe
cmd = \"C:/Program Files/Perforce/p4merge.exe\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[mergetool]
keepBackup = false
[diff]
guitool = p4merge
tool = p4merge
renames = copy
renamelimit = 0
[difftool "p4merge"]
path = C:/Program Files/Perforce/p4merge.exe
cmd = \"C:/Program Files/Perforce/p4merge.exe\" \"$LOCAL\" \"$REMOTE\"
[push]
default = matching
[alias]
tree = log --pretty=oneline --date-order --graph --decorate
last = log -1 HEAD
co = checkout
ci = commit
st = status
br = branch
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
[branch]
autosetupmerge = true
[difftool]
prompt = false
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment