gitconfig: Add aliases for stash commands.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index c9be20a001aa7312d422992ca5f6b8bc3ea130e1..aaad40e0c415cb68644841f79888356c1d4997df 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,7 +13,7 @@
 
 [core]
        editor = vim
-       excludesfile = HOME/.gitignore
+       excludesfile = GITIGNORE
 
 [alias]
        # Shortcuts for often used commands.
@@ -17,7 +23,21 @@
        co = checkout
        br = branch
        me = merge
+       fe = fetch
+       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