gitconfig: Allow diffing of gzip files.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index 3325a3c1a4950a5090ece62a136deb17494f3b73..67d4213909808896a0f43891a6f7281fa6bdbb13 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -19,21 +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
+       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
@@ -44,18 +47,28 @@ include(../lib.m4)
        t  = tag
        p  = push
        pu = push
-       # Custom commands.
-       fs = fsck --strict --full
-       glog = log --pretty=oneline --graph --all
        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 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)
        tool = opendiff