2 hooksPath = ~/.git-hooks-global
3 excludesfile = ~/.gitignore-global
19 defaultToUpstream = true
23 zeroPaddedFileMode = warn
25 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
30 diw = diff --color-words
32 dicw = diff --cached --color-words
34 ffpull = pull --ff-only
35 lso = ls-files -X .gitignore -o
36 pushn = !git push origin --set-upstream "$(git rev-parse --abbrev-ref HEAD)":"$(git rev-parse --abbrev-ref HEAD)"
37 pushd = !git push origin --delete "$(git rev-parse --abbrev-ref HEAD)"
38 pushf = push --force-with-lease
39 cherry-pick = cherry-pick -x
40 branches-to-kill = !git branch --merged origin/master|grep -v master|xargs -n1 echo git branch -d
41 mergediff = !git checkout --quiet --detach HEAD && git merge --no-edit origin/master && git diff -C10 -M10 origin/master && git checkout --quiet -
42 expire-prune = !git reflog expire --expire=now --all && git gc --prune=now
43 serve = daemon --reuseaddr --base-path=. --export-all --verbose
45 email = jamesbunton@delx.au