gitconfig: Use --patience for diffs.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index f05576ab314d052633f560ede759f94214a94895..71785d92ea12e4faf0424c99c4c3dc041ca0fc11 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -19,19 +19,20 @@ 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
+       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
@@ -55,6 +56,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