[March 30] Desktop 2.7: Cherry-picking commits (github#18378)

ethanpalm · web-flow · commit b1ff6c16ae76 · 2021-03-30T16:34:13.000-04:00
* Create "Cherry-picking a commit"

* Fix filename

* Add link to git-cherry-pick documentation in glossary

* Initial outline

* Cherry-picking article

* Incorporate reviewer feedback
diff --git a/assets/images/help/desktop/cherry-picking.png b/assets/images/help/desktop/cherry-picking.png
diff --git a/content/desktop/contributing-and-collaborating-using-github-desktop/cherry-picking-a-commit.md b/content/desktop/contributing-and-collaborating-using-github-desktop/cherry-picking-a-commit.md
@@ -0,0 +1,23 @@
+---
+title: Cherry-picking a commit
+intro: You can pick a specific commit on one branch and copy the commit to another branch.
+versions:
+  free-pro-team: '*'
+---
+
+### About Git cherry-pick
+
+You can cherry-pick a commit on one branch to create a copy of the commit with the same changes on another branch. If you commit changes to the wrong branch or want to make the same changes to another branch, you can cherry-pick the commit to apply the changes to another branch. You can also use cherry-picking to apply specific changes before you are ready to create or merge a pull request. For example, if you commit a bug fix to a feature branch, you can cherry-pick the commit with the bug fix to other branches of your project.
+
+You can also use cherry-picking when collaborating with a team. Some projects incorporate contributions by cherry-picking commits. For more information, see [Distributed Git - Maintaining a Project](https://git-scm.com/book/en/v2/Distributed-Git-Maintaining-a-Project#_rebase_cherry_pick) in the Git documentation.
+
+### Cherry-picking a commit
+
+{% data reusables.desktop.current-branch-menu %}
+2. In the list of branches, click the branch that has the commit that you want to cherry-pick.
+{% data reusables.desktop.history-tab %}
+4. Drag the commit that you want to cherry-pick to the {% octicon "git-branch" aria-label="The branch icon" %} **Current Branch** menu and drop the commit on the branch that you want to copy the commit to.
+  ![Dragging a commit to another branch in the Current Branch menu](/assets/images/help/desktop/cherry-picking.png)
+
+### Further reading
+- [git-cherry-pick](https://git-scm.com/docs/git-cherry-pick) in the Git documentation
diff --git a/content/desktop/contributing-and-collaborating-using-github-desktop/index.md b/content/desktop/contributing-and-collaborating-using-github-desktop/index.md
@@ -22,6 +22,7 @@ versions:
     {% link_in_list /stashing-changes %}
     {% link_in_list /pushing-changes-to-github %}
     {% link_in_list /reverting-a-commit %}
+    {% link_in_list /cherry-picking-a-commit %}
     {% link_in_list /managing-tags %}
     {% link_in_list /viewing-the-branch-history %}
 {% topic_link_in_list /working-with-your-remote-repository-on-github-or-github-enterprise %}
diff --git a/data/glossaries/external.yml b/data/glossaries/external.yml
@@ -91,7 +91,7 @@
     working tree is pointing to a new branch.
 - term: cherry-picking
   description: >-
-    To choose a subset of changes from a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the `git cherry-pick` command to extract the change introduced by an existing commit on another branch and to record it based on the tip of the current branch as a new commit.
+    To choose a subset of changes from a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the `git cherry-pick` command to extract the change introduced by an existing commit on another branch and to record it based on the tip of the current branch as a new commit. For more information, see [git-cherry-pick](https://git-scm.com/docs/git-cherry-pick) in the Git documentation.
 - term: child team
   description: >-
     Within nested teams, the subteam that inherits the parent team's access
