summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-03 22:16:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-03 22:16:05 (GMT)
commit103c95dbfb31788e1805eb31a03fbdff76f3be70 (patch)
tree5bb594f12998026e8cf908983056486d89e79b3c /contrib
parentc167a96e68b9fb49cab7eb1f2814d7b32f7c0a1a (diff)
parentfa4b5e3a35142fabfe905d7e503eeb85773c56ed (diff)
downloadgit-103c95dbfb31788e1805eb31a03fbdff76f3be70.zip
git-103c95dbfb31788e1805eb31a03fbdff76f3be70.tar.gz
git-103c95dbfb31788e1805eb31a03fbdff76f3be70.tar.bz2
Merge branch 'jk/completion-rebase'
* jk/completion-rebase: completion: add missing git-rebase options
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash8
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index a2db20c..800e0bb 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