mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-10-26 04:30:27 +01:00
unposted (after 38939): _git-rebase: Unbreak.
This commit is contained in:
parent
d5e7987408
commit
8e06a6a28a
2 changed files with 4 additions and 1 deletions
|
|
@ -1344,7 +1344,7 @@ _git-rebase () {
|
|||
'*'{-X+,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]:option' \
|
||||
'(-q --quiet -v --verbose --stat -n --no-stat)'{-q,--quiet}'[suppress all output]' \
|
||||
'(-q --quiet -v --verbose --stat -n --no-stat)'{-v,--verbose}'[output additional information]' \
|
||||
'--rerere-autoupdate[allow rerere to update index with resolved conflicts' \
|
||||
'--rerere-autoupdate[allow rerere to update index with resolved conflicts]' \
|
||||
'--no-verify[bypass the pre-rebase hook]' \
|
||||
'-C-[ensure that given lines of surrounding context match]: :__git_guard_number "lines of context"' \
|
||||
'(-f --force-rebase)'{-f,--force-rebase}'[force rebase even if current branch descends from commit rebasing onto]' \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue