Browse Source

Merge branch 'du/cherry-is-plumbing' into maint

Doc update to mark "git cherry" as a plumbing command.

* du/cherry-is-plumbing:
  doc: move git-cherry to plumbing
maint
Junio C Hamano 6 years ago
parent
commit
a6dc172d00
  1. 2
      command-list.txt
  2. 11
      contrib/completion/git-completion.bash

2
command-list.txt

@ -62,7 +62,7 @@ git-check-mailmap purehelpers @@ -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

11
contrib/completion/git-completion.bash

@ -1340,17 +1340,6 @@ _git_checkout () @@ -1340,17 +1340,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 ()

Loading…
Cancel
Save