@@ 5,6 5,7 @@ 
 	st = status
 	ci = commit
 	mergetest = "!f(){ git merge --no-commit --no-ff \"$1\"; git merge --abort; echo \"Merge aborted\"; };f "
+	undo-commit = reset --soft HEAD^
 [push]
 	default = matching
 [sendemail]

          
@@ 19,3 20,5 @@ 
 [core]
 	# Backup for $LESS
 	pager = /usr/bin/less -X -F -R
+[branch]
+	sort = -committerdate