gitconfig: move gitignore_global

[dotfiles] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 87680ab12ae168caf25c30da7d055aa47ea48666..9652e9a8a6f362ff22e266fee8e986f707ef2a13 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,15 +1,24 @@
 [user]
        name = James Bunton
        email = jamesbunton@delx.net.au
-[color]
-       ui = always
 [core]
        pager = less -+F -+X
-       editor = vim
+       excludesfile = ~/.gitignore_global
+[color]
+       ui = auto
 [log]
        decorate = full
+[diff]
+       renamelimit = 10000
+       renames = copies
+       context = 5
+       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
@@ -21,3 +30,11 @@
        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