X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=cc29fcbed7b319b80362f3bad147dde9ab98bdce;hb=627c0417717ac8cd19125b5d9c9e309f28a17df1;hp=f2b86b4e4d23a251b907b24766dfd80fe732696f;hpb=4f6e80b96fd0b0ff17f83521c5b6fd7a44c0521f;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index f2b86b4..cc29fcb 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -1,17 +1,35 @@
+# Global Git configuration file.
+
+
+dnl Load m4 macros.
+include(../lib.m4)
+
 [user]
 	name = Simon Ruderich
 	email = simon@ruderich.org
 
 [color]
-	diff = auto
+	ui = auto
 
 [core]
-	excludesfile = HOME/.gitignore
+	editor = vim
+	excludesfile = GITIGNORE
 
 [alias]
+	# Shortcuts for often used commands.
 	ci = commit -v
 	di = diff
 	st = status
 	co = checkout
 	br = branch
 	me = merge
+	# Custom commands.
+	fs = fsck --strict --full
+	glog = log --pretty=oneline --graph --all
+
+[merge]
+IF(OS, darwin)
+	tool = opendiff
+FI
+
+# vim: ft=gitconfig