X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=ff77b2bfb88d64be82926b8dfab179cb1073a728;hb=6648ff8ff39ef7999d76913a6f8ef50e67f78366;hp=66c73761245e5a4aad1706b131a88be64ab74382;hpb=c132a73d71bfb6de4bdbe4ea935e5df7968dd179;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index 66c7376..ff77b2b 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -59,6 +59,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 +71,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,7 +123,30 @@ 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.
@@ -143,9 +169,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)
@@ -165,4 +191,4 @@ FI
 	# receive-pack and git fetch (>= 1.7.8, for fetch)).
 	fsckobjects = true
 
-# vim: ft=gitconfig noet
+# vim: ft=gitconfig