diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index c4443f844..1c52478fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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> * 33047: .distfiles, Completion/.distfiles, 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]') } |