diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-05 22:54:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-05 22:54:16 (GMT) |
| commit | d509fa44eddc9adea5f955b77bb9dd6cfb0fe358 (patch) | |
| tree | 999e7af21f98b524b21eab2f0950fcc45c25c858 /contrib | |
| parent | 02dab5d399fb276f91646d7780da90596bffefab (diff) | |
| parent | fa4b5e3a35142fabfe905d7e503eeb85773c56ed (diff) | |
| download | git-d509fa44eddc9adea5f955b77bb9dd6cfb0fe358.zip git-d509fa44eddc9adea5f955b77bb9dd6cfb0fe358.tar.gz git-d509fa44eddc9adea5f955b77bb9dd6cfb0fe358.tar.bz2 | |
Merge branch 'jk/completion-rebase' into maint
* jk/completion-rebase:
completion: add missing git-rebase options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 6956807..5cec0ee 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1687,8 +1687,12 @@ _git_rebase () --preserve-merges --stat --no-stat --committer-date-is-author-date --ignore-date --ignore-whitespace --whitespace= - --autosquash --fork-point --no-fork-point - --autostash + --autosquash --no-autosquash + --fork-point --no-fork-point + --autostash --no-autostash + --verify --no-verify + --keep-empty --root --force-rebase --no-ff + --exec " return |