X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=171f256626745f352cdcdc6c732b2e76f4d0e95c;hb=6185676752044be8c954377be9a8b982689b181e;hp=2f1ee7afce180aed06e31f5ce2839b5245cba1d9;hpb=736772a24a226ea7be684d3eaf9006bcd77b7eea;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index 2f1ee7a..171f256 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -1,5 +1,20 @@
 # Global Git configuration file.
 
+# Copyright (C) 2011-2012  Simon Ruderich
+#
+# This file is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+
 
 dnl Load m4 macros.
 include(../lib.m4)
@@ -25,17 +40,18 @@ include(../lib.m4)
 	# 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
@@ -49,17 +65,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)