.gitconfig

[diff]
# external = git-diff-wrapper.sh
algorithm = patience
# colorMoved=plain

[pager]
diff =

[color]
diff = auto
status = auto
branch = auto
interactive = auto
ui = auto

[color "status"]
added = green
changed = yellow
header = white
untracked = cyan
updated = green
branch = 130
nobranch = red

[color "diff"]
newMoved = 39
oldMoved = 166

[color "interactive"]
prompt=blue
header=white
help=green
error=red

[alias]
staged    = diff --cached
stauts    = status
ststus    = status
statsu    = status
grpe      = grep
rep       = grep
g         = "!f() { echo 'ignoring js/css/map files...' 1>&2; sleep 1; git grep \"$@\" -- './.' ':(exclude)*/*.js' ':(exclude)*/*.css' ':(exclude)*/*.map'; }; f"
digg      = diff
dif       = diff
lgo       = log
shwo      = show
br        = branch
c         = commit -v
ca        = commit -v -a
cmomit    = commit -v
cmmoit    = commit -v
ci        = commit -v
cia       = commit -v --amend
ic        = commit -v --interactive
co        = checkout
cp        = cherry-pick
rb        = rebase
ir        = rebase --interactive --autosquash
rbc       = rebase --continue
rbs       = rebase --skip
rl        = reflog
rp        = remote prune
rs        = remote show
rt        = remote
ru        = remote update
sb        = show-branch
sm        = submodule
up        = !git stash && git pull --rebase && git pupu && git stash pop
pul       = pull
pr        = pull --rebase
mpush     = "!f() { git pull --rebase && git push all && git fetch && rgrowl 'pushed to all from directory '$(pwd); }; f"
rpupu     = "!f() { git pull --rebase origin $( git branch | grep '^*' | awk '{print $2}' ) && git push && rgrowl 'pushed from directory '$(pwd); }; f"
pp        = "!f() { until git rpupu; do rgrowl '*thrust*'; sleep 1; done; }; f"
pupu      = "!f() { until git rpupu; do rgrowl '*thrust*'; sleep 1; done; }; f"
pupur     = "!f() { until git rpupu; do rgrowl '*thrust*'; sleep 1; done; git reset --hard HEAD^; }; f"
ppr       = "!f() { until git rpupu; do rgrowl '*thrust*'; sleep 1; done; git reset --hard HEAD^; }; f"
down      = !git stash && git pull --rebase && git stash pop
vd        = difftool -t vimdiff
tr        = !sh -c 'echo git branch --track "$0" "$1" && git checkout "$0"'
st        = status
lg        = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
sc        = clean -dnfx
cu        = clean -dfx
ls        = log --abbrev=12 --pretty=format:"%C(226)%h\\ %C(33)%ci%C(reset)\\ %s%C(129)%d\\ %C(34)[%cn]" --decorate
ll        = log --abbrev=12 --pretty=format:"%C(226)%h\\ %C(33)%ci%C(reset)\\ %s%C(129)%d\\ %C(34)[%cn]" --decorate --numstat
snap      = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
ours      = "!f() { git checkout --ours $@ && git add $@; }; f"
theirs    = "!f() { git checkout --theirs $@ && git add $@; }; f"
arb       = "!f() { EDITOR='grep -v ^#' git ir $@; }; f"
fl        = "!f() { EDITOR='cat > /dev/null' git commit -a --amend; }; f"
find      = "!f() { git ls-files | egrep \"$@\"; }; f"
me        = "!f() { git ls --author=$MY_WORK_EMAIL $@; }; f"
myr       = "!f() { git me --after=\"$(date --date='3 months ago' +%F)\"; }; f"
pval      = "!f() { git status | grep modified: | awk '{print $2}' | ( while read f; do puppet parser validate $f; done ); }; f"
pva       = "!f() { git pval; }; f"
show-stash = "!f() { git show stash@{$@}; }; f"
# nuke_branch = !sh -c 'git branch -D "$0" && git push origin ":$0"' &> /dev/null

[push]
default = current

[rebase]
# stat = true

[merge]
tool = vimdiff
conflictstyle = diff3