gitconfig: added expire-prune

[dotfiles] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 1f0cafa9d4b864e84480ec2e39231d4ce18f6362..694d7bb396c6880c34fb2563a81007bfeffe012c 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,13 +1,21 @@
 [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]
+       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
@@ -18,5 +26,12 @@
        dic = diff --cached
        dicw = diff --cached --color-words
        ff = merge --ff-only
-[push]
-       default = upstream
+       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