diff options
| author | John Keeping <john@keeping.me.uk> | 2014-01-11 18:27:12 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-14 02:20:25 +0400 |
| commit | 85453fd1e36c581c1e6b7939e46badf2581837b3 (patch) | |
| tree | 0a975e7346a05771ae480202f1979fc9c367267b /contrib | |
| parent | a25014bc4cef56712f7d005d7b76070d0270f454 (diff) | |
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.bash | 6 |
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)" } |