X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=67d4213909808896a0f43891a6f7281fa6bdbb13;hb=9f73960533b77a4fba9d95709099ea5f9eb1c4c4;hp=b452b6855abdfc50d2b0810572306d199a871e53;hpb=af1d0957f6e2684094c5339f426f19cff3dd7bc4;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index b452b68..67d4213 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -13,22 +13,30 @@ include(../lib.m4)
 
 [core]
 	editor = vim
+	# Can't use ~/ because of older git versions.
 	excludesfile = GITIGNORE
 
+# Use pager for the following commands.
 [pager]
-	# Use pager with git status.
 	status = yes
+	tag = yes
 
 [alias]
 	# Shortcuts for often used commands.
 	c  = commit -v
 	ci = commit -v
-	d  = diff
-	di = diff
+	d  = diff --patience
+	di = diff --patience
+	dc = diff --patience --cached
 	s  = status
 	st = status
 	l  = log
+	ls = log --stat
+	lp = log -p --patience
+	glog = log --pretty=oneline --graph --all
 	a  = add
+	ap = add -p
+	au = add -u
 	co = checkout
 	b  = branch -av
 	br = branch -av
@@ -36,19 +44,31 @@ 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
+	ssk = stash save --keep-index
 	sa = stash apply
 	sl = stash list
+	fp = format-patch
 
 [diff]
 	# Detect copies and renames.
 	renames = copy
 
+# Allow diffing of some binary files.
+# `pdftotext-` is a wrapper around pdftotext which writes to stdout.
+# `sqlite3dump` is a wrapper calling `sqlite3 database-file .dump`.
+[diff "gzip"]
+	textconv = gzip -d -c
+[diff "pdf"]
+	textconv = pdftotext-
+[diff "sqlite"]
+	textconv = sqlite3dump
+
 [merge]
 IF(OS, darwin)
 	tool = opendiff
@@ -57,4 +77,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