gitconfig: Add comment about sqlite3dump.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index 36dcbd284517fac0f6cd964d1d9b35d3278ec559..0bf7b0037f3912de7a398d3cf4e6d8edb831457a 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -13,23 +13,30 @@ 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
+       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 --patience
+       glog = log --pretty=oneline --graph --all
        a  = add
+       ap = add -p
+       au = add -u
        co = checkout
        b  = branch -av
        br = branch -av
@@ -37,19 +44,29 @@ 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
+       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. `sqlite3dump` is a wrapper calling `sqlite3 database-file
+# .dump`.
+[diff "pdf"]
+       textconv = pdftotext-
+[diff "sqlite"]
+       textconv = sqlite3dump
+
 [merge]
 IF(OS, darwin)
        tool = opendiff
@@ -58,4 +75,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