From: Junio C Hamano Date: Wed, 3 Feb 2016 22:16:05 +0000 (-0800) Subject: Merge branch 'jk/completion-rebase' X-Git-Tag: v2.8.0-rc0~75 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/103c95dbfb31788e1805eb31a03fbdff76f3be70?hp=c167a96e68b9fb49cab7eb1f2814d7b32f7c0a1a Merge branch 'jk/completion-rebase' * jk/completion-rebase: completion: add missing git-rebase options --- diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index a2db20c81f..800e0bb1af 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1688,8 +1688,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