Merge branch 'du/cherry-is-plumbing'
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Oct 2018 05:22:14 +0000 (14:22 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Oct 2018 05:22:14 +0000 (14:22 +0900)
Doc update to mark "git cherry" as a plumbing command.

* du/cherry-is-plumbing:
doc: move git-cherry to plumbing

1  2 
command-list.txt
contrib/completion/git-completion.bash
diff --combined command-list.txt
index e25b0240fff708f4d6acba335ce5504126d2a4a4,9c8fcc6944a66ad7bc410e5aedadc2e731772ec7..3a9af104b55c9e2de4bc82390f4d1c48e6c407c3
@@@ -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
index db7fd87b6b27f6e85a48b31d08e0480648f9c5d5,12f7ce0c5c20a03b6c2d90034597d2ca230e7702..5f556075d3cbce74c60e81b97d4923a1ff18f78d
@@@ -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,*)