gitconfig: Use --patience for diffs.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index b452b6855abdfc50d2b0810572306d199a871e53..71785d92ea12e4faf0424c99c4c3dc041ca0fc11 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -13,22 +13,29 @@ include(../lib.m4)
 
 [core]
        editor = vim
+       # Can't use ~/ because of older git versions.
        excludesfile = GITIGNORE
 
+# Use pager for the following commands.
 [pager]
-       # Use pager with git status.
        status = 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
        co = checkout
        b  = branch -av
        br = branch -av
@@ -36,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
@@ -49,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
@@ -57,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