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

diff --git a/gitconfig.m4 b/gitconfig.m4
index 71785d9..67d4213 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -36,6 +36,7 @@ include(../lib.m4)
 	glog = log --pretty=oneline --graph --all
 	a  = add
 	ap = add -p
+	au = add -u
 	co = checkout
 	b  = branch -av
 	br = branch -av
@@ -49,17 +50,24 @@ include(../lib.m4)
 	ru = remote update
 	fs = fsck --strict --full
 	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 PDF files. `pdftotext-` is a wrapper around pdftotext which
-# writes to stdout.
+# 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)