autosetuprebase, group-directories-first

gitconfig

@@ -36,6 +36,8 @@
 
 [merge]
 	defaultToUpstream = true
+[branch]
+	autosetuprebase = remote
 
 [alias]
 	short = log --graph --pretty=format:'%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --patience

zshrc

@@ -65,7 +65,7 @@ export EDITOR=vim
 export MANPAGER="/bin/sh -c \"col -bx | vim -c 'set ft=man' -\""
 export GREP_COLORS='ms=01;36:mc=01;31:sl=:cx=:fn=35:ln=33:bn=33:se=01;34'
 
-alias ls='ls --color=auto -hv'
+alias ls='ls --color=auto -hv --group-directories-first'
 alias ll='ls -l'
 alias l.='ls -Ad .*'
 alias la='ls -A'