From 85453fd1e36c581c1e6b7939e46badf2581837b3 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Sat, 11 Jan 2014 14:27:12 +0000 Subject: completion: complete merge-base options Signed-off-by: John Keeping Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'contrib') 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)" } -- cgit v1.2.3 From 4310e328d416be00e58e90b69ed3b62f5845c744 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Sat, 11 Jan 2014 14:27:13 +0000 Subject: completion: handle --[no-]fork-point options to git-rebase Signed-off-by: John Keeping Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') 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 -- cgit v1.2.3