mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-08 12:01:21 +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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-08-24 Barton E. Schaefer <schaefer@zsh.org>
* unposted (see 33050): Completion/Unix/Command/_git: un-transpose
help text for git merge -{-no,}-verify
2014-08-23 Peter Stephenson <p.w.stephenson@ntlworld.com> 2014-08-23 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 33047: .distfiles, Completion/.distfiles, * 33047: .distfiles, Completion/.distfiles,

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]' '--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' '*'{-s,--strategy=}'[use given merge strategy]:merge strategy:__git_merge_strategies'
'*'{-X,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]' '*'{-X,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]'
'(--verify-signatures)--no-verify-signatures[verify the commits being merged or abort]' '(--verify-signatures)--verify-signatures[verify the commits being merged or abort]'
'(--no-verify-signatures)--verify-signatures[do not verify the commits being merged]' '(--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)'{-q,--quiet}'[suppress all output]'
'(-q --quiet -v --verbose)'{-v,--verbose}'[output additional information]') '(-q --quiet -v --verbose)'{-v,--verbose}'[output additional information]')
} }