3 email = jamesbunton@delx.net.au
6 excludesfile = ~/.gitignore_global
22 defaultToUpstream = true
26 graphlog = log --graph --pretty=format:'%C(bold black)%h%Creset %C(bold red)%ad %C(bold blue)%s%Creset %C(bold yellow)%d%Creset %C(bold black)<%an>%Creset' --date=short
31 diw = diff --color-words
33 dicw = diff --cached --color-words
35 ffpull = pull --ff-only
36 lso = ls-files -X .gitignore -o
37 pushn = !git push origin --set-upstream "$(git rev-parse --abbrev-ref HEAD)":"$(git rev-parse --abbrev-ref HEAD)"
38 pushd = !git push origin --delete "$(git rev-parse --abbrev-ref HEAD)"
39 pushf = push --force-with-lease
40 cherry-pick = cherry-pick -x
41 branches-to-kill = !git branch --merged origin/master|grep -v master|xargs -n1 echo git branch -d
42 mergediff = !git checkout --quiet --detach HEAD && git merge --no-edit origin/master && git diff -C10 -M10 origin/master && git checkout --quiet -
43 expire-prune = !git reflog expire --expire=now --all && git gc --prune=now