gitconfig: Allow diffing of PDF files.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index 36dcbd284517fac0f6cd964d1d9b35d3278ec559..f0e268dc5e5c9a4a3a953da6dc473d0a4530c60a 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -13,9 +13,10 @@ include(../lib.m4)
 
 [core]
        editor = vim
+       # Can't use ~/ because of older git versions.
        excludesfile = GITIGNORE
 
-       # Use pager for the following commands.
+# Use pager for the following commands.
 [pager]
        status = yes
        clean = yes
@@ -26,10 +27,15 @@ include(../lib.m4)
        ci = commit -v
        d  = diff
        di = diff
+       dc = diff --cached
        s  = status
        st = status
        l  = log
+       ls = log --stat
+       lp = log -p
+       glog = log --pretty=oneline --graph --all
        a  = add
+       ap = add -p
        co = checkout
        b  = branch -av
        br = branch -av
@@ -37,11 +43,11 @@ 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
        sa = stash apply
        sl = stash list
@@ -50,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
@@ -58,4 +69,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