X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=4fec07701d98463390b1bc99c45ba34a144405e1;hb=4daf3588f9130eb18d5f4de95f36027c36f1667d;hp=c9be20a001aa7312d422992ca5f6b8bc3ea130e1;hpb=71b7c3d3914974cd860814f1e9ba8d7fb4211590;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index c9be20a..4fec077 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -7,7 +7,7 @@
 
 [core]
 	editor = vim
-	excludesfile = HOME/.gitignore
+	excludesfile = GITIGNORE
 
 [alias]
 	# Shortcuts for often used commands.
@@ -20,4 +20,9 @@
 	# Custom commands.
 	glog = log --pretty=oneline --graph --all
 
+[merge]
+IF(OS, darwin)
+	tool = opendiff
+FI
+
 # vim: ft=gitconfig