How do I merge a specific commit from one branch into another in Git?

by

The git cherry-pick <commit> command allows you to take a single commit (from whatever branch) and, essentially, rebase it in your working branch.

Chapter 5 of the Pro Git book explains it better than I can, complete with diagrams and such. (The chapter on Rebasing is also good reading.)

Lastly, there are some good comments on the cherry-picking vs merging vs rebasing in another SO question.

More Related Contents:

  1. Error when pushing amended commit to remote [duplicate]
  2. Is there a way to cache https credentials for pushing commits?
  3. How to do a GitHub pull request
  4. Git, fatal: The remote end hung up unexpectedly
  5. Download a single folder or directory from a GitHub repo
  6. Git keeps prompting me for a password
  7. Git SSH error: “Connect to host: Bad file number”
  8. Git push results in “Authentication Failed”
  9. How to recover from a git push -force?
  10. Unable to change Git account
  11. ‘git diff’ doesn’t show enough
  12. GitHub: How to make a fork of public repository private?
  13. ! [rejected] master -> master (fetch first)
  14. Trying To Understand/Determine A Basic Git Workflow
  15. How to merge remote changes at GitHub?
  16. Push to origin from GitHub action
  17. Heroku: How to push different local Git branches to Heroku/master
  18. How do I rename a repository on GitHub?
  19. Send a pull request on GitHub for only latest commit
  20. How do you fork your own repository on GitHub?
  21. How to clone all repos at once from GitHub?
  22. Unable to Connect to GitHub.com For Cloning
  23. Error when push commits with Github: fatal: could not read Username
  24. Deleting remote master branch, refused due to being the current branch
  25. Remove commit for good
  26. Pushing to github after a shallow clone
  27. Recover a commit sent as a pull-request from a deleted fork on GitHub
  28. git export from github remote repository
  29. Do GitHub and GitLab support git clone’s –filter parameter?
  30. Why does ‘git commit’ not save my changes?

Leave a Comment