gitattributes: Add, global Git attributes file.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index fa52f07e0fe9477ac074cc2d5aef2102152f0d60..75cd32799908909d24d3d992bb3916b7e89045a8 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -42,6 +42,9 @@ include(../lib.m4)
 
 [core]
        editor = vim
+       # Global gitattributes file. Thanks to canton7 in #git on Freenode
+       # (2011-11-09 13:23 CET).
+       attributesfile = PWD/gitattributes
 
 # Use pager for the following commands.
 [pager]
@@ -59,6 +62,8 @@ include(../lib.m4)
        ## Local.
        c   = commit --verbose
        ci  = commit --verbose
+       ca  = commit --verbose --amend
+       cad = commit --verbose --amend --date=
        d   = diff PATIENCE
        di  = diff PATIENCE
        dw  = diff PATIENCE --color-words
@@ -121,7 +126,7 @@ include(../lib.m4)
        # precise enough control over formats and colors.
        #
        # tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
-       tig = ! TIG
+       tig = ! PWD/bin/tig.pl
 
        # Create backup of uncommitted and untracked changes.
        ssb = "! git stash save --include-untracked \
@@ -167,9 +172,9 @@ include(../lib.m4)
 [diff "gzip"]
        textconv = gzip -d -c
 [diff "pdf"]
-       textconv = pdftotext-
+       textconv = PWD/bin/pdftotext-
 [diff "sqlite"]
-       textconv = sqlite3dump
+       textconv = PWD/bin/sqlite3dump
 
 [merge]
 IF(OS, darwin)
@@ -189,4 +194,4 @@ FI
        # receive-pack and git fetch (>= 1.7.8, for fetch)).
        fsckobjects = true
 
-# vim: ft=gitconfig noet
+# vim: ft=gitconfig