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

diff --git a/gitconfig.m4 b/gitconfig.m4
index ee62097..cad62c1 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -62,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
@@ -82,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 \
@@ -117,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
 
@@ -131,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