X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=9ffe45bde0d04440617dbf7df18f4f04f8d66878;hb=1dd790a7f4920b044689f97faaa022e6873b45ae;hp=49c785cd68b6d9af23b22927cad2c5b4b8a608c5;hpb=92c7bbecc4cc1f604fe2fae27c07870a6a017adb;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index 49c785c..9ffe45b 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -1,4 +1,7 @@
-dnl Load macros.
+# Global Git configuration file.
+
+
+dnl Load m4 macros.
 include(../lib.m4)
 
 [user]
@@ -12,20 +15,48 @@ include(../lib.m4)
 	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
+	t  = tag
+	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