diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2016-07-27 14:04:39 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2016-07-27 14:04:40 +0000 |
| commit | 8e06a6a28a00adeef8d7b443faaa88138544870a (patch) | |
| tree | 96599d1062984dea685ba31f5307a6bad0e6f7f2 | |
| parent | d5e7987408202e2f6530f888935c4a6bd6115fde (diff) | |
| download | zsh-8e06a6a28a00adeef8d7b443faaa88138544870a.tar.gz zsh-8e06a6a28a00adeef8d7b443faaa88138544870a.tar.xz zsh-8e06a6a28a00adeef8d7b443faaa88138544870a.zip | |
unposted (after 38939): _git-rebase: Unbreak.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 55d7c8044..15fe53b70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 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 options, complete *.pc files for positional arguments. diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index b54b208fb..71ced8413 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -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]' \ |