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

diff --git a/gitconfig.m4 b/gitconfig.m4
index 1dd4f7b..cc29fcb 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,7 +13,7 @@
 
 [core]
 	editor = vim
-	excludesfile = HOME/.gitignore
+	excludesfile = GITIGNORE
 
 [alias]
 	# Shortcuts for often used commands.
@@ -18,4 +24,12 @@
 	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