diff --git a/aliases/functions b/aliases/functions
index 4de415d..707d0c0 100644
--- a/aliases/functions
+++ b/aliases/functions
@@ -392,3 +392,10 @@ if exists gron; then
 	gron | grep "$@" | gron -u
     }
 fi
+
+autostash() {
+    git stash
+    git "$@"
+    git stash pop
+}
+compdef _git autostash
diff --git a/aliases/git b/aliases/git
index f477c63..a5eb000 100644
--- a/aliases/git
+++ b/aliases/git
@@ -33,8 +33,8 @@ defvcsfun gcm       "commit"            "commit"        "commit"
 defvcsfun ga        "add"               "add"           "add"
 defvcsfun gpu       "push"              "push"          "i_am_not_distributed_please_dont_push_me"
 
+alias gs="git switch"
 alias gco="git checkout"
-alias gca="git commit -a"
 alias gap="git add --patch"