X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=51b5946ec36d8d8316aba4735f55776dc025c04b;hb=56ee1004c09bfc6bd5174b09da3401e28b3dca3b;hp=f2b86b4e4d23a251b907b24766dfd80fe732696f;hpb=4f6e80b96fd0b0ff17f83521c5b6fd7a44c0521f;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index f2b86b4..51b5946 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -3,15 +3,26 @@
 	email = simon@ruderich.org
 
 [color]
-	diff = auto
+	ui = auto
 
 [core]
+	editor = vim
 	excludesfile = HOME/.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