Skip to content
GitTree
العربية

Video: Apply selected commits with cherry-pick

The video plays in YouTube’s player, in privacy-enhanced mode.

Copy one teammate's fix onto your release branch without merging her whole branch, then check the new commit, its author, its files and what stayed behind.

Read the full lesson

The article has every step and command from the video, the practice exercise and the questions.

Go to the lesson

Video transcript

The narration of the video, cue by cue.

  1. Take one fix from another branch, and leave the rest.
  2. Cherry-pick copies the change one commit made, as a new commit here.
  3. The copy has a new ID, but keeps the author and the message.
  4. Build a baseline, Priya's branch with a note and a fix, and your release branch.
  5. Open the folder. The graph shows both branches from the same baseline.
  6. Priya's fix sits on top of an unrelated note. We want only the fix.
  7. Select the fix. One changed path: index.html.
  8. Make sure release label is current, and the work tree is clean.
  9. Right-click the fix, and choose Cherry-Pick Commit.
  10. There is no branch picker. It applies to the branch you are on.
  11. On the current commit itself, the command is disabled.
  12. Run it, and wait for the real result.
  13. A new commit sits on release label.
  14. Its ID differs from Priya's, because its parent is different.
  15. The author is still Priya. The committer is you.
  16. The page has the clarified label.
  17. The unrelated note did not come along. Your own note is still here.
  18. Priya's branch is exactly as it was.
  19. In the terminal, git log with a format shows the subject, author and committer.
  20. git diff-tree lists the paths this one commit changed.
  21. The status is empty. Nothing was left behind.
  22. With the x option, the message records where the pick came from.
  23. Pick the same commit again, and Git stops: the pick is empty.
  24. Change the input: the target has no signup form.
  25. The pick stops with a conflict. Resolve and continue, or abort.
  26. A change can depend on commits you did not take. Test the target.
  27. Abort puts the branch back. The source is never modified.
  28. Practice: report the new ID, author, committer and files.
  29. Next, set unfinished work aside safely with stash.

All tutorials