Skip to content

Instantly share code, notes, and snippets.

@bradwilson
Last active August 17, 2020 16:46
Show Gist options
  • Save bradwilson/4215933 to your computer and use it in GitHub Desktop.
Save bradwilson/4215933 to your computer and use it in GitHub Desktop.
.gitconfig
[user]
name = Brad Wilson
email = [email protected]
[alias]
a = add -A
abort = rebase --abort
amend = commit --amend -C HEAD
bl = blame -w -M -C
br = branch
cat = cat-file -t
ci = commit -a
co = checkout
cp = cherry-pick
d = diff -w --patience
down = pull --progress
df = diff --word-diff=color --word-diff-regex=. -w --patience
dt = difftool
dump = cat-file -p
go = rebase --continue
in = log --pretty=format:\"%h %ad | %s%d [%an]\" --date=short ..@{u}
l = log --pretty=format:\"%h %ad | %s%d [%an]\" --date=short
lg = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
mt = mergetool
out = log --pretty=format:\"%h %ad | %s%d [%an]\" --date=short @{u}..
pick = add -p
praise = blame
r = add --refresh
re = rebase
scorch = clean -xdf -e packages -e .nuget -e nuget.exe -e *.dbmdl -e *.suo -e *.user -e .vs
skip = rebase --skip
st = status -sb
stats = diff --stat
undo = reset HEAD~
up = push
wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
[color "branch"]
current = red bold
local = normal
remote = yellow bold
plain = normal
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
header = normal
added = red bold
updated = green bold
changed = cyan bold
untracked = cyan bold
nobranch = red bold
[core]
editor = notepad2
[credential]
helper = winstore
[diff]
tool = p4merge
[diff "astextplain"]
textconv = astextplain
[difftool]
prompt = false
[difftool "bc3"]
cmd = "bcomp.exe" \"$LOCAL\" \"$REMOTE\"
keepBackup = false
trustExitCode = false
[difftool "p4merge"]
cmd = "p4merge.exe" \"$LOCAL\" \"$REMOTE\"
keepBackup = false
trustExitCode = false
[help]
format = html
[merge]
tool = p4merge
[mergetool]
prompt = false
keepBackup = false
[mergetool "bc3"]
cmd = "bcomp.exe" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true
[mergetool "p4merge"]
cmd = "p4merge.exe" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[pack]
packSizeLimit = 2g
[push]
default = current
[pull]
rebase = true
[rebase]
autosquash = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment