git: No need to create .gitignore.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index c9be20a001aa7312d422992ca5f6b8bc3ea130e1..4fec07701d98463390b1bc99c45ba34a144405e1 100644 (file)
--- 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