tigrc: Use relative dates.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index f2b86b4e4d23a251b907b24766dfd80fe732696f..36dcbd284517fac0f6cd964d1d9b35d3278ec559 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -1,17 +1,61 @@
+# Global Git configuration file.
+
+
+dnl Load m4 macros.
+include(../lib.m4)
+
 [user]
        name = Simon Ruderich
        email = simon@ruderich.org
 
 [color]
-       diff = auto
+       ui = auto
 
 [core]
-       excludesfile = HOME/.gitignore
+       editor = vim
+       excludesfile = GITIGNORE
+
+       # Use pager for the following commands.
+[pager]
+       status = yes
+       clean = yes
 
 [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
+
+[diff]
+       # Detect copies and renames.
+       renames = copy
+
+[merge]
+IF(OS, darwin)
+       tool = opendiff
+FI
+IF(OS, debian)
+       tool = vimdiff
+FI
+
+# vim: ft=gitconfig