]> ruderich.org/simon Gitweb - config/dotfiles.git/blobdiff - gitconfig.m4
gitconfig: Allow diffing of PDF files.
[config/dotfiles.git] / gitconfig.m4
index 016a2f053be4df7679dec58c6d8186703ceed931..f0e268dc5e5c9a4a3a953da6dc473d0a4530c60a 100644 (file)
@@ -13,18 +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]
+       status = yes
+       clean = yes
+
 [alias]
        # Shortcuts for often used commands.
        c  = commit -v
        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
@@ -32,15 +43,24 @@ 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
 
+[diff]
+       # 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
@@ -49,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