Skip to content

Instantly share code, notes, and snippets.

@joshrobb
Forked from bradwilson/gist:4215933
Created December 6, 2012 11:25
Show Gist options
  • Save joshrobb/4223815 to your computer and use it in GitHub Desktop.
Save joshrobb/4223815 to your computer and use it in GitHub Desktop.
.gitconfig
[user]
name = Brad Wilson
email = [email protected]
[alias]
amend = commit --amend
bl = blame -w -M -C
br = branch
cat = cat-file -t
co = checkout
df = diff --word-diff
dump = cat-file -p
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
pick = add -p
re = rebase
st = status -sb
stats = diff --stat
undo = reset head~
[color]
ui = 1
[color "branch"]
current = red bold
local = normal
remote = yellow bold
plain = normal
[color "status"]
header = normal
added = red bold
updated = green bold
changed = cyan bold
untracked = cyan bold
nobranch = red bold
[core]
editor = notepad2
[diff]
tool = p4merge
[difftool]
prompt = false
[difftool "p4merge"]
cmd = "p4merge.exe" \"$LOCAL\" \"$REMOTE\"
keepBackup = false
trustExitCode = false
[merge]
tool = p4merge
[mergetool]
prompt = false
keepBackup = false
[mergetool "p4merge"]
cmd = "p4merge.exe" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[push]
default = current
[credential]
helper = winstore
[pack]
packSizeLimit = 2g
[help]
format = html
[diff "astextplain"]
textconv = astextplain
[rebase]
autosquash = true
[rerere]
enabled = 1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment