X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=1eb17f2541d56db264618d4626644db52d9585aa;hb=708517e604ba88d5f5786b20ad21536be6237651;hp=1dd4f7b7b3a25f58bb7222b43a0c225582caabfc;hpb=8251bdb225ed90edb82ed444f55e8ae1fe50e6ac;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index 1dd4f7b..1eb17f2 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
@@ -7,15 +13,55 @@
 
 [core]
 	editor = vim
-	excludesfile = HOME/.gitignore
+	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
+
+[format]
+	# When using git format-patch use threads and add all patches as
+	# replies to the first one.
+	thread = shallow
+
+# vim: ft=gitconfig