mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-22 16:20:23 +02:00
Code Releases Activity

un-transpose help text for git merge -{-no,}-verify

Browse source
This commit is contained in:
Barton E. Schaefer 2014-08-24 08:43:40 -07:00
parent cc6e9db29d
commit 2e99ef809d
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Completion/Unix/Command/_git
View file

@ -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]')
}