X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=df9e59843f07cb11960556f06c2a60570a879a0d;hb=b14dbc872fd5528fae8507298a4f52c7abd42f0d;hp=eab047768cfa47678e1e45e08800698880392d6f;hpb=ebc0bb997aa0ccc5b410d3bbf5bc90f99a461424;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index eab0477..df9e598 100644
--- 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,12 +13,28 @@
 
 [core]
 	editor = vim
-	excludesfile = HOME/.gitignore
+	excludesfile = GITIGNORE
 
 [alias]
+	# Shortcuts for often used commands.
 	ci = commit -v
 	di = diff
 	st = status
 	co = checkout
 	br = branch
 	me = merge
+	fe = fetch
+	pu = push
+	# Custom commands.
+	fs = fsck --strict --full
+	glog = log --pretty=oneline --graph --all
+
+[merge]
+IF(OS, darwin)
+	tool = opendiff
+FI
+IF(OS, debian)
+	tool = vimdiff
+FI
+
+# vim: ft=gitconfig