git: No need to create .gitignore.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index 899319dfe80235c2c01620c1bdb18fa1b5997420..4fec07701d98463390b1bc99c45ba34a144405e1 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -6,12 +6,23 @@
        ui = auto
 
 [core]
-       excludesfile = HOME/.gitignore
+       editor = vim
+       excludesfile = GITIGNORE
 
 [alias]
+       # Shortcuts for often used commands.
        ci = commit -v
        di = diff
        st = status
        co = checkout
        br = branch
        me = merge
+       # Custom commands.
+       glog = log --pretty=oneline --graph --all
+
+[merge]
+IF(OS, darwin)
+       tool = opendiff
+FI
+
+# vim: ft=gitconfig