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://git.lorimer.id.au/gitweb.git/diff_plain/eff5d693ad5ff28daf2244ce2618896e87cccb2b?hp=-c

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

eff5d693ad5ff28daf2244ce2618896e87cccb2b
diff --combined command-list.txt
index e25b0240ff,9c8fcc6944..3a9af104b5
--- a/command-list.txt
+++ b/command-list.txt
@@@ -62,7 -62,7 +62,7 @@@ git-check-mailma
  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
@@@ -96,7 -96,7 +96,7 @@@ git-for-each-re
  git-format-patch                        mainporcelain
  git-fsck                                ancillaryinterrogators          complete
  git-gc                                  mainporcelain
 -git-get-tar-commit-id                   ancillaryinterrogators
 +git-get-tar-commit-id                   plumbinginterrogators
  git-grep                                mainporcelain           info
  git-gui                                 mainporcelain
  git-hash-object                         plumbingmanipulators
@@@ -123,7 -123,6 +123,7 @@@ git-merge-inde
  git-merge-one-file                      purehelpers
  git-mergetool                           ancillarymanipulators           complete
  git-merge-tree                          ancillaryinterrogators
 +git-multi-pack-index                    plumbingmanipulators
  git-mktag                               plumbingmanipulators
  git-mktree                              plumbingmanipulators
  git-mv                                  mainporcelain           worktree
@@@ -153,7 -152,7 +153,7 @@@ git-rerer
  git-reset                               mainporcelain           worktree
  git-revert                              mainporcelain
  git-rev-list                            plumbinginterrogators
 -git-rev-parse                           ancillaryinterrogators
 +git-rev-parse                           plumbinginterrogators
  git-rm                                  mainporcelain           worktree
  git-send-email                          foreignscminterface             complete
  git-send-pack                           synchingrepositories
diff --combined contrib/completion/git-completion.bash
index db7fd87b6b,12f7ce0c5c..5f556075d3
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -943,7 -943,6 +943,7 @@@ __git_complete_remote_or_refspec (
  			*) ;;
  			esac
  			;;
 +		--multiple) no_complete_refspec=1; break ;;
  		-*) ;;
  		*) remote="$i"; break ;;
  		esac
@@@ -1341,17 -1340,6 +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 ()
@@@ -2568,9 -2556,6 +2557,9 @@@ _git_stash (
  		drop,--*)
  			__gitcomp "--quiet"
  			;;
 +		list,--*)
 +			__gitcomp "--name-status --oneline --patch-with-stat"
 +			;;
  		show,--*|branch,--*)
  			;;
  		branch,*)