summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2014-01-11 14:27:13 +0000
committerJunio C Hamano <gitster@pobox.com>2014-01-13 14:20:31 -0800
commit4310e328d416be00e58e90b69ed3b62f5845c744 (patch)
tree3e5c8b020f0213d49d65fdbc6b6acec91881eac6
parent85453fd1e36c581c1e6b7939e46badf2581837b3 (diff)
downloadgit-jk/complete-merge-base.tar.gz
completion: handle --[no-]fork-point options to git-rebasejk/complete-merge-base
Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--contrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e74d402423..3c1a11f256 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1637,7 +1637,7 @@ _git_rebase ()
--preserve-merges --stat --no-stat
--committer-date-is-author-date --ignore-date
--ignore-whitespace --whitespace=
- --autosquash
+ --autosquash --fork-point --no-fork-point
"
return