gitconfig: Call git branch with -av.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index eab047768cfa47678e1e45e08800698880392d6f..016a2f053be4df7679dec58c6d8186703ceed931 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -1,3 +1,9 @@
+# Global Git configuration file.
+
+
+dnl Load m4 macros.
+include(../lib.m4)
+
 [user]
        name = Simon Ruderich
        email = simon@ruderich.org
@@ -7,12 +13,40 @@
 
 [core]
        editor = vim
-       excludesfile = HOME/.gitignore
+       excludesfile = GITIGNORE
 
 [alias]
+       # Shortcuts for often used commands.
+       c  = commit -v
        ci = commit -v
+       d  = diff
        di = diff
+       s  = status
        st = status
+       l  = log
+       a  = add
        co = checkout
-       br = branch
+       b  = branch -av
+       br = branch -av
+       m  = merge
        me = merge
+       f  = fetch
+       fe = fetch
+       p  = push
+       pu = push
+       # Custom commands.
+       fs = fsck --strict --full
+       glog = log --pretty=oneline --graph --all
+       ss = stash save
+       sa = stash apply
+       sl = stash list
+
+[merge]
+IF(OS, darwin)
+       tool = opendiff
+FI
+IF(OS, debian)
+       tool = vimdiff
+FI
+
+# vim: ft=gitconfig