diff --git a/lib/git/aliases.sh b/lib/git/aliases.sh
index 7a55f70..37bb8a6 100644
--- a/lib/git/aliases.sh
+++ b/lib/git/aliases.sh
@@ -65,11 +65,9 @@ _git
 __git_alias () {
   if [ -n "$1" ]; then
     local alias_str cmd_prefix cmd cmd_args
-    alias_str="$1"; cmd_prefix="$2"; cmd="$3"; cmd_args=("${@:4}")
-    if [ "$shell" = "zsh" ]; then
-        cmd_args=("${@:3}")
-    fi
-
+    alias_str="$1"; cmd_prefix="$2"; cmd="$3";
+    shift 3 2>/dev/null
+    cmd_args=$@
     alias $alias_str="$cmd_prefix $cmd${cmd_args:+ }${cmd_args[*]}"
     if [ "$shell" = "bash" ]; then
       __define_git_completion "$alias_str" "$cmd"