X-Git-Url: https://code.delx.au/dotfiles/blobdiff_plain/99ab1ac3c054c1c9047fad0d5dc4ce0b0aa68ad3..fa3c00e8c7773426e698bc704febd8e9d70484fd:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index 63278c0..694d7bb 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,31 +1,37 @@
 [user]
-    name = James Bunton
-    email = jamesbunton@delx.net.au
-[color]
-    ui = always
+	name = James Bunton
+	email = jamesbunton@delx.net.au
 [core]
-    pager = less -+F -+X
-    editor = vim
+	pager = less -+F -+X
+	excludesfile = ~/.gitignore
+[color]
+	ui = auto
 [log]
-    decorate = full
+	decorate = full
+	follow = true
 [diff]
-    renamelimit = 10000
+	renamelimit = 10000
+	renames = copies
+	context = 5
+	algorithm = minimal
 [push]
-    # Set to tracking instead of upstream for backwards compatibility
-    default = tracking
+	default = upstream
 [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
-    co = checkout
-    st = status
-    di = diff
-    diw = diff --color-words
-    dic = diff --cached
-    dicw = diff --cached --color-words
-    ff = merge --ff-only
-    ffpull = pull --ff-only
-    lso = ls-files -X .gitignore -o
-    pushn = !git push origin --set-upstream "$(git rev-parse --abbrev-ref HEAD)"
-    pushd = !git push origin --delete "$(git rev-parse --abbrev-ref HEAD)"
-    cherry-pick = cherry-pick -x
-    branches-to-kill = !git branch --merged origin/master|grep -v master|xargs -n1 echo git branch -d
+	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
+	co = checkout
+	st = status
+	di = diff
+	diw = diff --color-words
+	dic = diff --cached
+	dicw = diff --cached --color-words
+	ff = merge --ff-only
+	ffpull = pull --ff-only
+	lso = ls-files -X .gitignore -o
+	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