X-Git-Url: https://code.delx.au/dotfiles/blobdiff_plain/33f4d58b85283828be1de094bd098b50f6e4b63b..673bbacda0823171b5aa39f8c1133170fb0c89b0:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index ee52155..c7644b8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,18 +1,23 @@
 [user]
 	name = James Bunton
 	email = jamesbunton@delx.net.au
-[color]
-	ui = always
 [core]
 	pager = less -+F -+X
-	editor = vim
+	excludesfile = ~/.gitignore
+[color]
+	ui = auto
 [log]
 	decorate = full
+	follow = true
 [diff]
 	renamelimit = 10000
+	renames = copies
+	context = 5
+	algorithm = minimal
 [push]
-	# Set to tracking instead of upstream for backwards compatibility
-	default = tracking
+	default = upstream
+[merge]
+	defaultToUpstream = 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
@@ -25,7 +30,10 @@
 	ff = merge --ff-only
 	ffpull = pull --ff-only
 	lso = ls-files -X .gitignore -o
-	pushn = !git push origin -u --set-upstream "$(git rev-parse --abbrev-ref HEAD)"
+	pushn = !git push origin --set-upstream "$(git rev-parse --abbrev-ref HEAD)":"$(git rev-parse --abbrev-ref HEAD)"
 	pushd = !git push origin --delete "$(git rev-parse --abbrev-ref HEAD)"
+	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 -
+	expire-prune = !git reflog expire --expire=now --all && git gc --prune=now
\ No newline at end of file