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

diff --git a/gitconfig.m4 b/gitconfig.m4
index 899319d..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
@@ -6,12 +12,29 @@
 	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
+	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