]> ruderich.org/simon Gitweb - config/dotfiles.git/blobdiff - gitconfig.m4
gitconfig: Allow diffing of SQLite files.
[config/dotfiles.git] / gitconfig.m4
index f0e268dc5e5c9a4a3a953da6dc473d0a4530c60a..9ef037614fa79283d3d661dfa4739174e3ce69e5 100644 (file)
@@ -19,23 +19,24 @@ include(../lib.m4)
 # 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
-       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,8 +50,10 @@ 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.
@@ -60,6 +63,8 @@ include(../lib.m4)
 # writes to stdout.
 [diff "pdf"]
        textconv = pdftotext-
+[diff "sqlite"]
+       textconv = sqlite3dump
 
 [merge]
 IF(OS, darwin)