summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar John Keeping <john@keeping.me.uk>2014-01-11 14:27:12 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-13 14:20:25 -0800
commit85453fd1e36c581c1e6b7939e46badf2581837b3 (patch)
tree0a975e7346a05771ae480202f1979fc9c367267b /contrib
parentUpdate draft release notes to 1.9 (diff)
downloadtgif-85453fd1e36c581c1e6b7939e46badf2581837b3.tar.xz
completion: complete merge-base options
Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash6
1 files changed, 6 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 4fe5ce31bd..e74d402423 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1499,6 +1499,12 @@ _git_mergetool ()
_git_merge_base ()
{
+ case "$cur" in
+ --*)
+ __gitcomp "--octopus --independent --is-ancestor --fork-point"
+ return
+ ;;
+ esac
__gitcomp_nl "$(__git_refs)"
}