X-Git-Url: https://code.delx.au/dotfiles/blobdiff_plain/fbc0cb7f1a864487cad9e0d0d31179ae156cb40d..HEAD:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index c7644b8..13da5d5 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,14 +1,13 @@
-[user]
-	name = James Bunton
-	email = jamesbunton@delx.net.au
 [core]
-	pager = less -+F -+X
-	excludesfile = ~/.gitignore
+	hooksPath = ~/.git-hooks-global
+	excludesfile = ~/.gitignore-global
+[pager]
+	branch = less -F
+	tag = less -F
 [color]
 	ui = auto
 [log]
 	decorate = full
-	follow = true
 [diff]
 	renamelimit = 10000
 	renames = copies
@@ -18,6 +17,10 @@
 	default = upstream
 [merge]
 	defaultToUpstream = true
+[transfer]
+	fsckObjects = true
+[fetch "fsck"]
+	zeroPaddedFileMode = warn
 [alias]
 	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
 	ci = commit
@@ -36,4 +39,8 @@
 	cherry-pick = cherry-pick -x
 	branches-to-kill = !git branch --merged origin/master|grep -v master|xargs -n1 echo git branch -d
 	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
\ No newline at end of file
+	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