Merge branch 'master' into 'translate_desktop'

[xonotic/xonotic.git] / misc / tools / all / zsh_autocompletion / all / _all

diff --git a/misc/tools/all/zsh_autocompletion/all/_all b/misc/tools/all/zsh_autocompletion/all/_all
index 218c42ccfb2aa807500706d93c2bb06b5a32f2b3..f4a8e6dbbb18e7c450f5830699f44d156c94baf4 100644 (file)
--- a/misc/tools/all/zsh_autocompletion/all/_all
+++ b/misc/tools/all/zsh_autocompletion/all/_all
@@ -19,9 +19,9 @@ _1st_arguments=(
     'serverbench:run the server benchmark'
     'fix_upstream_rebase:fix upstream rebase'
     'fix_config:fix .git/config'
-    'keygen:generate ssh key for repo access'
-    {checkout,switch}':checkout a specific branch'
-    'branch:create a branch in a repo'
+    'keygen:generate ssh key for repo access if one does not exist yet'
+    {checkout,switch}':checkout a specific branch in repos where it exists and default branch elsewhere'
+    'branch:create a branch in a repo (asks for repo)'
     {push,commit}':commit and push changes'
     {each,foreach}':run a command in each repo'
     'grep:run "git grep" in all repos'
@@ -51,12 +51,15 @@ case $state in
             _arguments \
                 '1:Version:(sdl glx dedicated)' \
                 "-0[don't use precompiled d0_blind_id]" \
+                "-1[don't compile d0_blind_id]" \
                 '-c[clean all before building]' \
                 '-qc[clean QuakeC binaries]' \
-                - '(release)' \
-                    '-r[build in release mode]' \
+                - '(debug)' \
+                    '-d[build in debug mode]' \
                 - '(profile)' \
-                    '-p[build in profile mode]' && ret=0
+                    '-p[build in profile mode]' \
+                - '(release)' \
+                    '-r[build in release mode (default)]' && ret=0
             ;;
 
         compile-map)
@@ -78,7 +81,7 @@ case $state in
 
         update|pull)
             _arguments \
-                "-N[don't allow pull]" \
+                "-N[reset git config for each repo]" \
                 '-l[find the best mirror in the specified location]' \
                 - '(ssh)' \
                     {-p,-s}'[set ssh as push protocol and find the best mirror]' \