diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:58:05 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:58:05 +0300 |
| commit | a6dc172d00ce4b7bc3947b4a1143adec5c3bf5d9 (patch) | |
| tree | fbf6710e6ab0f4dd3cb5d4520c25ed367d5074d7 | |
| parent | c3ba2ae0ba27d14c86dc4579e2918ec8e36ba22d (diff) | |
| parent | 61018fe9e005a54e18184481927519d64035220a (diff) | |
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
| -rw-r--r-- | command-list.txt | 2 | ||||
| -rw-r--r-- | contrib/completion/git-completion.bash | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/command-list.txt b/command-list.txt index ba233285d6..93f3076e31 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 d63d2dffd4..12f7ce0c5c 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -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 () |