diff --git a/vcs/git/aliases.zsh b/vcs/git/aliases.zsh
index d0d8e6bf..4c106a35 100644
--- a/vcs/git/aliases.zsh
+++ b/vcs/git/aliases.zsh
@@ -1,9 +1,10 @@
-is-callable 'hub' && alias git='hub'
-g() { [ $# -eq 0 ] && git status --short || git $*; }
+is-callable hub && alias git='hub'
+g() { [[ $# = 0 ]] && git status --short . || git $*; }
+compdef g=hub
 
 alias gbr='git browse'
 alias gi='git init'
-alias gs='git status'
+alias gs='git status --short'
 alias gsu='git submodule'
 alias gsq='git rebase -i origin/master'
 alias gco='git checkout'
@@ -28,5 +29,4 @@ alias gt='git tag'
 alias gtd='git tag -d'
 alias gta='git tag -a'
 alias gl='git log --oneline --decorate'
-alias gls='git ls-files'