X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=aaad40e0c415cb68644841f79888356c1d4997df;hb=34380350ab6a9207aa210cf8bdc23618d10b0fff;hp=4fec07701d98463390b1bc99c45ba34a144405e1;hpb=4daf3588f9130eb18d5f4de95f36027c36f1667d;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index 4fec077..aaad40e 100644
--- 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
@@ -17,12 +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