X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=ee62097e67d98262e41550ef9ec0165880e065ab;hb=7f38887f667ef0d6adfaef19b75543a86e15606e;hp=5b16dad41d26b9f5a2681ac3542cf2e3a0ef091e;hpb=6c3765f8f9bf89a2fb297aae14e06114ab7d13b9;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index 5b16dad..ee62097 100644
--- 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]
@@ -50,7 +53,8 @@ include(../lib.m4)
 
 [interactive]
 	# Don't require <Return> in interactive commands which require only a
-	# single key, for example `git add --patch`.
+	# single key, for example `git add --patch`. Requires Perl module
+	# Term::Readkey.
 	singlekey = yes
 
 [alias]
@@ -59,6 +63,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
@@ -69,6 +75,7 @@ include(../lib.m4)
 	l   = log
 	ls  = log --stat
 	lp  = log --patch PATIENCE
+	lpw = log --patch PATIENCE --color-words
 	a   = add
 	ap  = add --patch
 	au  = add --update
@@ -120,13 +127,31 @@ include(../lib.m4)
 	# precise enough control over formats and colors.
 	#
 	# tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
-	tig = ! TIG | less
+	tig = ! PWD/bin/tig.pl
 
 	# Create backup of uncommitted and untracked changes.
 	ssb = "! git stash save --include-untracked \
 	                        \"Backup on $(date -R)\" >/dev/null \
 	      && git stash apply >/dev/null"
 
+	# Display list and content of untracked files. Untracked directories
+	# and symbolic links are only listed.
+	u = "! git ls-files --other --exclude-standard --directory -z \
+	     | xargs -0 sh -c '\
+	           for x; do \
+	               printf \"\\033[1;33m-> %s\\033[0m:\" \"$x\"; \
+	               if test -d \"$x\"; then \
+	                   echo \" directory\"; \
+	               elif test -h \"$x\"; then \
+	                   echo \" symbolic link\"; \
+	               else \
+	                   echo; \
+	                   cat \"$x\"; \
+	               fi; \
+	               echo; \
+	           done' argv0 \
+	     | less"
+
 [diff]
 	# Detect copies and renames.
 	renames = copy
@@ -148,9 +173,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)
@@ -170,4 +195,4 @@ FI
 	# receive-pack and git fetch (>= 1.7.8, for fetch)).
 	fsckobjects = true
 
-# vim: ft=gitconfig noet
+# vim: ft=gitconfig