bashrc: find SSH keyring in more places

[dotfiles] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 9e79711b9de280a2038e77727d613e4d271f8ed5..13da5d5b07902817c3194a65a0bd3787b7a73d78 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,5 +1,6 @@
 [core]
-       excludesfile = ~/.gitignore_global
+       hooksPath = ~/.git-hooks-global
+       excludesfile = ~/.gitignore-global
 [pager]
        branch = less -F
        tag = less -F
@@ -39,3 +40,7 @@
        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
+       serve = daemon --reuseaddr --base-path=. --export-all --verbose
+[user]
+       email = jamesbunton@delx.au
+       name = James Bunton