Skip to content

Instantly share code, notes, and snippets.

@davidalpert
Created May 7, 2013 08:21
Show Gist options
  • Select an option

  • Save davidalpert/5531052 to your computer and use it in GitHub Desktop.

Select an option

Save davidalpert/5531052 to your computer and use it in GitHub Desktop.
the core of my .gitconfig file
[user]
email = david@spinthemoose.com
name = David Alpert
[core]
autocrlf = true
safecrlf = false
[color]
branch = auto
diff = auto
status = auto
[color "status"]
added = cyan
changed = red
untracked = yellow bold
[alias]
ci = commit
co = checkout
br = branch
st = status
pad = add --patch
lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset%-n' --date=relative
[merge]
keepBackup = false
tool = p4merge
[mergetool "p4merge"]
cmd = p4merge.exe $BASE $LOCAL $REMOTE $MERGED
keepTemporaries = false
trustExitCode = false
keepBackup = false
[diff]
tool = p4merge
[difftool "p4merge"]
path = C:/Program Files/P4Merge/
cmd = "p4merge.exe $LOCAL $REMOTE"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment