X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=36dcbd284517fac0f6cd964d1d9b35d3278ec559;hb=5b95d776e095b3bbb3791aeb49969dd8310307fe;hp=eab047768cfa47678e1e45e08800698880392d6f;hpb=ebc0bb997aa0ccc5b410d3bbf5bc90f99a461424;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index eab0477..36dcbd2 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,12 +13,49 @@
 
 [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
+	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