X-Git-Url: https://code.delx.au/dotfiles/blobdiff_plain/4953e2a8b515ff9c594cc5b5a9c5fc72ad954495..a21efa43c917f62d9ea1b15043aa64bf8b8d4ab4:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index 7321450..9652e9a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,12 +3,11 @@
 	email = jamesbunton@delx.net.au
 [core]
 	pager = less -+F -+X
-	excludesfile = ~/.gitignore
+	excludesfile = ~/.gitignore_global
 [color]
 	ui = auto
 [log]
 	decorate = full
-	follow = true
 [diff]
 	renamelimit = 10000
 	renames = copies
@@ -16,6 +15,10 @@
 	algorithm = minimal
 [push]
 	default = upstream
+[merge]
+	defaultToUpstream = true
+[transfer]
+	fsckObjects = true
 [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
@@ -33,4 +36,5 @@
 	pushf = push --force-with-lease
 	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 -
\ No newline at end of file
+	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