From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Oct 2018 05:22:14 +0000 (+0900)
Subject: Merge branch 'du/cherry-is-plumbing'
X-Git-Tag: v2.20.0-rc0~133
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/eff5d693ad5ff28daf2244ce2618896e87cccb2b?hp=1fd2ffca7d89569674399e8cc192bba9c509e0a6

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
---

diff --git a/command-list.txt b/command-list.txt
index e25b0240ff..3a9af104b5 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 db7fd87b6b..5f556075d3 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 ()