X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=3561376dbf69b69698c4ffecbf2dc6489d8b3434;hb=fba7a6ccc323fc1b33e241c11d2d90538b7b8c0e;hp=7876a96cc4a4e904654e137dc0bf96566ee8da49;hpb=e5c50a8384fd220dffd7cfb1880b01461ab50e83;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index 7876a96..3561376 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]
@@ -58,16 +62,14 @@ 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
 	dc  = diff PATIENCE --cached
 	dcw = diff PATIENCE --cached --color-words
+	ds  = diff --stat
 	s   = status
-	st  = status
 	l   = log
 	ls  = log --stat
 	lp  = log --patch PATIENCE
@@ -78,16 +80,12 @@ include(../lib.m4)
 	## Branches.
 	co  = checkout
 	b   = branch -a -v
-	br  = branch -a -v
 	m   = merge
-	me  = merge
 	mo  = merge origin/master
 	## Remote.
 	f   = fetch
-	fe  = fetch
 	t   = tag
 	p   = push
-	pu  = push
 	# Parallel git remote update. Also strips unnecessary output.
 	ru = "! git remote \
 	      | xargs -d '\\n' -n1 -P0 git remote update 2>&1 \
@@ -113,6 +111,7 @@ include(../lib.m4)
 	sl  = stash list
 	ss  = stash save
 	ssk = stash save --keep-index
+	ssu = stash save --include-untracked
 	sa  = stash apply
 	sp  = stash pop
 
@@ -127,7 +126,8 @@ include(../lib.m4)
 
 	# Create backup of uncommitted and untracked changes.
 	ssb = "! git stash save --include-untracked \
-	                        \"Backup on $(date -R)\" >/dev/null \
+	             \"Backup on $(LANG=C date '+%a, %d %b %Y %H:%M:%S %z')\" \
+	             >/dev/null \
 	      && git stash apply >/dev/null"
 
 	# Display list and content of untracked files. Untracked directories
@@ -169,17 +169,12 @@ 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)
-	tool = opendiff
-FI
-IF(OS, debian)
 	tool = vimdiff
-FI
 
 [format]
 	# When using git format-patch use threads and add all patches as
@@ -191,4 +186,4 @@ FI
 	# receive-pack and git fetch (>= 1.7.8, for fetch)).
 	fsckobjects = true
 
-# vim: ft=gitconfig noet
+# vim: ft=gitconfig