gitconfig: Allow diffing of SQLite files.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index eab047768cfa47678e1e45e08800698880392d6f..9ef037614fa79283d3d661dfa4739174e3ce69e5 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -1,3 +1,9 @@
+# Global Git configuration file.
+
+
+dnl Load m4 macros.
+include(../lib.m4)
+
 [user]
        name = Simon Ruderich
        email = simon@ruderich.org
@@ -7,12 +13,70 @@
 
 [core]
        editor = vim
-       excludesfile = HOME/.gitignore
+       # Can't use ~/ because of older git versions.
+       excludesfile = GITIGNORE
+
+# Use pager for the following commands.
+[pager]
+       status = yes
+       tag = yes
 
 [alias]
+       # Shortcuts for often used commands.
+       c  = commit -v
        ci = commit -v
-       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
-       br = branch
+       b  = branch -av
+       br = branch -av
+       m  = merge
        me = merge
+       f  = fetch
+       fe = fetch
+       t  = tag
+       p  = push
+       pu = push
+       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.
+[diff "pdf"]
+       textconv = pdftotext-
+[diff "sqlite"]
+       textconv = sqlite3dump
+
+[merge]
+IF(OS, darwin)
+       tool = opendiff
+FI
+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