summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index debd989ca..9681b683a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-08-21  Clint Adams  <clint@zsh.org>
 
+	* 25493: Completion/Unix/Command/_git: allow -q to be used in all
+	git checkout contexts.
+
 	* 25491: Completion/Unix/Command/_git: patch to improve
 	"git checkout" completion, from Mikael Magnusson.
 
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 38cabf72f..9b8aec0a1 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1549,8 +1549,8 @@ _git-checkout () {
         '*::file:->files' && ret=0
   else
     _arguments -C -S \
-      - switch-branch \
         '-q[suppress feedback messages]' \
+      - switch-branch \
         '-f[force a complete re-read]' \
         '-b[create a new branch based at given branch]: :__git_guard_branch-name' \
         {-t,--track}'[set up configuration so pull merges from the start point]' \