Git pick changes from another branch

Question

I have 3 branches: master, featureA, featureB. I want to import a few changes(not necessarily in separate commits) from branch A into branch B, how do I do it? I guess I should use some command in an interactive mode, but I haven't figured out what would do.

Answer 1

You'll want to use git cherry-pick.

You can do this declaratively, by specifying the commit hash to merge in on the command line.

If the changes are not necessarily full commits, git cherry-pick --no-commit followed by some editing and a git commit (or git commit --amend) is what you are after.