gitconfig: Documentation update.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index 2f1ee7afce180aed06e31f5ce2839b5245cba1d9..65d6b26e3cc938fb711d3d6e78aee7f698407455 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -25,17 +25,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 +50,22 @@ 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 "pdf"]
        textconv = pdftotext-
+[diff "sqlite"]
+       textconv = sqlite3dump
 
 [merge]
 IF(OS, darwin)