mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-18 13:01:05 +02:00
Code Releases Activity

unposted (after 38939): _git-rebase: Unbreak.

Browse source
This commit is contained in:
Daniel Shahaf 2016-07-27 14:04:39 +00:00
parent d5e7987408
commit 8e06a6a28a
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2016-07-27 Daniel Shahaf <d.s@daniel.shahaf.name> 2016-07-27 Daniel Shahaf <d.s@daniel.shahaf.name>
* unposted (after 38939): Completion/Unix/Command/_git:
_git-rebase: Unbreak.
* 38914 (tweaked): Completion/Unix/Command/_pkg-config: Add * 38914 (tweaked): Completion/Unix/Command/_pkg-config: Add
options, complete *.pc files for positional arguments. options, complete *.pc files for positional arguments.

2
Completion/Unix/Command/_git
View file

@ -1344,7 +1344,7 @@ _git-rebase () {
'*'{-X+,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]:option' \ '*'{-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)'{-q,--quiet}'[suppress all output]' \
'(-q --quiet -v --verbose --stat -n --no-stat)'{-v,--verbose}'[output additional information]' \ '(-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]' \ '--no-verify[bypass the pre-rebase hook]' \
'-C-[ensure that given lines of surrounding context match]: :__git_guard_number "lines of context"' \ '-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]' \ '(-f --force-rebase)'{-f,--force-rebase}'[force rebase even if current branch descends from commit rebasing onto]' \