hgrc: Also don't use pager for view and clone.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index 899319dfe80235c2c01620c1bdb18fa1b5997420..cc29fcbed7b319b80362f3bad147dde9ab98bdce 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
@@ -6,12 +12,24 @@
        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.
+       fs = fsck --strict --full
+       glog = log --pretty=oneline --graph --all
+
+[merge]
+IF(OS, darwin)
+       tool = opendiff
+FI
+
+# vim: ft=gitconfig