I have a branch named local which is a descendant of master with changes which are local to my machine that I want only in my own working environment, and never anywhere else. I have a branch named work which is a descendant of local and includes not only the local changes which I do not want to commit to our working repository, but also some changes I have worked on and now do want to commit.
I have a branch named stage which is a pristine copy of master. I want to assemble JUST the changes I made in work that I want to commit, lacking the changes I made in local. How do I tell git "merge the differences between local and work into stage; not including any of the changes between master and local"? I know how to use git cherry to get a list of just the commits involved, but I don't know any command that says "Merge just those commits into this branch."
Thanks to anyone for any help you can provide.