summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-01-27 10:43:55 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-27 10:43:55 -0800
commitba98a2f6604fd2f9107ca9aec7d9b25e10a9ad60 (patch)
tree49453cb22fd186eb27b69219622c83ce33b91052 /contrib
parentMerge branch 'ab/subtree-doc' (diff)
parentcompletion: handle --[no-]fork-point options to git-rebase (diff)
downloadtgif-ba98a2f6604fd2f9107ca9aec7d9b25e10a9ad60.tar.xz
Merge branch 'jk/complete-merge-base'
* jk/complete-merge-base: completion: handle --[no-]fork-point options to git-rebase completion: complete merge-base options
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash8
1 files changed, 7 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8aaf214b7d..9525343fcd 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)"
}
@@ -1631,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