status: short, show branch; alias s: untracked files 'normal'

gitconfig

@@ -9,6 +9,11 @@
 [interactive]
 	singleKey = true
 
+[status]
+	branch = true
+	short = true
+	showUntrackedFiles = normal
+
 [diff]
 	tool = vimdiff
 
@@ -25,6 +30,6 @@
 [alias]
 	c = commit
 	d = diff
-	s = status --short --untracked-files=all --branch
+	s = status
 	tree = log --graph --format=format:'%C(red)%G?%C(reset) %C(yellow)%h%C(reset)%C(blue)%d%C(reset) %C(dim green)%ar%C(reset) %C(white)%s%C(reset) %C(dim black)(%an, %ai)%C(reset)' --all
 	x = annex