gitconfig.m4: Improve comments.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index 1dd4f7b7b3a25f58bb7222b43a0c225582caabfc..4ab33c07423906770e2567b94a4b075ace3f1139 100644 (file)
--- 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.
@@ -19,3 +25,10 @@
        me = merge
        # Custom commands.
        glog = log --pretty=oneline --graph --all
+
+[merge]
+IF(OS, darwin)
+       tool = opendiff
+FI
+
+# vim: ft=gitconfig