about summary refs log tree commit diff
path: root/Completion/Unix
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2014-08-24 08:43:40 -0700
committerBarton E. Schaefer <schaefer@zsh.org>2014-08-24 08:43:40 -0700
commit2e99ef809dfda746ac3c79d75dc8b3b80c3e0598 (patch)
treed3c050b9dba6e4f67452f4167ec773d679735597 /Completion/Unix
parentcc6e9db29da73bb226b6e53ff4df0f135207d206 (diff)
downloadzsh-2e99ef809dfda746ac3c79d75dc8b3b80c3e0598.tar.gz
zsh-2e99ef809dfda746ac3c79d75dc8b3b80c3e0598.tar.xz
zsh-2e99ef809dfda746ac3c79d75dc8b3b80c3e0598.zip
un-transpose help text for git merge -{-no,}-verify
Diffstat (limited to 'Completion/Unix')
-rw-r--r--Completion/Unix/Command/_git4
1 files changed, 2 insertions, 2 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 7cd3324a8..b1f411a5e 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -6224,8 +6224,8 @@ __git_setup_merge_options () {
     '--ff-only[refuse to merge unless HEAD is up to date or merge can be resolved as a fast-forward]'
     '*'{-s,--strategy=}'[use given merge strategy]:merge strategy:__git_merge_strategies'
     '*'{-X,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]'
-    '(--verify-signatures)--no-verify-signatures[verify the commits being merged or abort]'
-    '(--no-verify-signatures)--verify-signatures[do not verify the commits being merged]'
+    '(--verify-signatures)--verify-signatures[verify the commits being merged or abort]'
+    '(--no-verify-signatures)--no-verify-signatures[do not verify the commits being merged]'
     '(-q --quiet -v --verbose)'{-q,--quiet}'[suppress all output]'
     '(-q --quiet -v --verbose)'{-v,--verbose}'[output additional information]')
 }