OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a25014b
)
completion: complete merge-base options
author
John Keeping
<john@keeping.me.uk>
Sat, 11 Jan 2014 14:27:12 +0000
(14:27 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 13 Jan 2014 22:20:25 +0000
(14:20 -0800)
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash
patch
|
blob
|
history
diff --git
a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index
4fe5ce3
..
e74d402
100644
(file)
--- 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)"
}