summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-02-05 14:54:16 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-05 14:54:16 -0800
commitd509fa44eddc9adea5f955b77bb9dd6cfb0fe358 (patch)
tree999e7af21f98b524b21eab2f0950fcc45c25c858 /contrib
parentMerge branch 'nd/diff-with-path-params' into maint (diff)
parentcompletion: add missing git-rebase options (diff)
downloadtgif-d509fa44eddc9adea5f955b77bb9dd6cfb0fe358.tar.xz
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.bash8
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 6956807519..5cec0ee3cc 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