X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gitconfig.m4;h=2b9889ec70fe87d3d686bc1e6dea238612257db4;hb=068c25e04d8a748353e4bfd32f949056abe4659b;hp=36dcbd284517fac0f6cd964d1d9b35d3278ec559;hpb=a3b1b3a594672199ab254d915cc98289ece327d7;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index 36dcbd2..2b9889e 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -13,12 +13,14 @@ include(../lib.m4)
 
 [core]
 	editor = vim
+	# Can't use ~/ because of older git versions.
 	excludesfile = GITIGNORE
 
-	# Use pager for the following commands.
+# Use pager for the following commands.
 [pager]
 	status = yes
 	clean = yes
+	tag = yes
 
 [alias]
 	# Shortcuts for often used commands.
@@ -26,10 +28,15 @@ include(../lib.m4)
 	ci = commit -v
 	d  = diff
 	di = diff
+	dc = diff --cached
 	s  = status
 	st = status
 	l  = log
+	ls = log --stat
+	lp = log -p
+	glog = log --pretty=oneline --graph --all
 	a  = add
+	ap = add -p
 	co = checkout
 	b  = branch -av
 	br = branch -av
@@ -37,11 +44,11 @@ include(../lib.m4)
 	me = merge
 	f  = fetch
 	fe = fetch
+	t  = tag
 	p  = push
 	pu = push
-	# Custom commands.
+	ru = remote update
 	fs = fsck --strict --full
-	glog = log --pretty=oneline --graph --all
 	ss = stash save
 	sa = stash apply
 	sl = stash list
@@ -50,6 +57,11 @@ include(../lib.m4)
 	# Detect copies and renames.
 	renames = copy
 
+# Allow diffing of PDF files. `pdftotext-` is a wrapper around pdftotext which
+# writes to stdout.
+[diff "pdf"]
+	textconv = pdftotext-
+
 [merge]
 IF(OS, darwin)
 	tool = opendiff
@@ -58,4 +70,9 @@ IF(OS, debian)
 	tool = vimdiff
 FI
 
+[format]
+	# When using git format-patch use threads and add all patches as
+	# replies to the first one.
+	thread = shallow
+
 # vim: ft=gitconfig