summaryrefslogtreecommitdiff
path: root/Completion/Unix/Command/_git
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2014-08-26 00:48:18 +0200
committerAxel Beckert <abe@deuxchevaux.org>2014-08-26 00:48:18 +0200
commita55d381f745d669c0ef9bdf0a4ce78a045ff3070 (patch)
tree31c741d92f2077f241835005b8cfd1db251445f6 /Completion/Unix/Command/_git
parent478d6c1db2ad16ea6b3cb6010cf083f2513494cf (diff)
parentcc69eef1cd835cd8d3f33960e9f616c894e7ae4f (diff)
downloadzsh-a55d381f745d669c0ef9bdf0a4ce78a045ff3070.tar.gz
zsh-a55d381f745d669c0ef9bdf0a4ce78a045ff3070.zip
Merge branch 'upstream' into debian
Diffstat (limited to 'Completion/Unix/Command/_git')
-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]')
}