mergediff = !git checkout --quiet --detach HEAD && git merge --no-edit origin/master && git diff -C10 -M10 origin/master && git checkout --quiet -
expire-prune = !git reflog expire --expire=now --all && git gc --prune=now
serve = daemon --reuseaddr --base-path=. --export-all --verbose
+[user]
+ email = jamesbunton@delx.au
+ name = James Bunton