I have two working branches, master and forum and I\'ve just made some modifications in forum branch, that I\'d like to ch
I'm surprised nobody suggested git cherry-pick -n forum. This will stage the changes from the latest forum commit but not commit them - you can then reset away the changes you don't need and commit what you want to keep.
git cherry-pick -n forum
forum
reset