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

diff --git a/gitconfig.m4 b/gitconfig.m4
index 2b9889e..67d4213 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -19,24 +19,24 @@ include(../lib.m4)
 # Use pager for the following commands.
 [pager]
 	status = yes
-	clean = yes
 	tag = yes
 
 [alias]
 	# Shortcuts for often used commands.
 	c  = commit -v
 	ci = commit -v
-	d  = diff
-	di = diff
-	dc = diff --cached
+	d  = diff --patience
+	di = diff --patience
+	dc = diff --patience --cached
 	s  = status
 	st = status
 	l  = log
 	ls = log --stat
-	lp = log -p
+	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
@@ -50,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)