[core]
editor = vim
- excludesfile = HOME/.gitignore
+ excludesfile = GITIGNORE
[alias]
# Shortcuts for often used commands.
me = merge
# Custom commands.
glog = log --pretty=oneline --graph --all
+
+[merge]
+IF(OS, darwin)
+ tool = opendiff
+FI
+
+# vim: ft=gitconfig