summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-26 05:22:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-26 05:22:14 (GMT)
commiteff5d693ad5ff28daf2244ce2618896e87cccb2b (patch)
treeda26b14980bad0003f8546fd523315afd9fcc0a5
parent1fd2ffca7d89569674399e8cc192bba9c509e0a6 (diff)
parent61018fe9e005a54e18184481927519d64035220a (diff)
downloadgit-eff5d693ad5ff28daf2244ce2618896e87cccb2b.zip
git-eff5d693ad5ff28daf2244ce2618896e87cccb2b.tar.gz
git-eff5d693ad5ff28daf2244ce2618896e87cccb2b.tar.bz2
Merge branch 'du/cherry-is-plumbing'
Doc update to mark "git cherry" as a plumbing command. * du/cherry-is-plumbing: doc: move git-cherry to plumbing
-rw-r--r--command-list.txt2
-rw-r--r--contrib/completion/git-completion.bash11
2 files changed, 1 insertions, 12 deletions
diff --git a/command-list.txt b/command-list.txt
index e25b024..3a9af10 100644
--- a/command-list.txt
+++ b/command-list.txt
@@ -62,7 +62,7 @@ git-check-mailmap purehelpers
git-checkout mainporcelain history
git-checkout-index plumbingmanipulators
git-check-ref-format purehelpers
-git-cherry ancillaryinterrogators complete
+git-cherry plumbinginterrogators complete
git-cherry-pick mainporcelain
git-citool mainporcelain
git-clean mainporcelain
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index db7fd87..5f55607 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1341,17 +1341,6 @@ _git_checkout ()
esac
}
-_git_cherry ()
-{
- case "$cur" in
- --*)
- __gitcomp_builtin cherry
- return
- esac
-
- __git_complete_refs
-}
-
__git_cherry_pick_inprogress_options="--continue --quit --abort"
_git_cherry_pick ()