In our git workflow we have two merge destinations: a dev branch which holds all the work from our finished feature branches, and a release branch where we left out some features that are not yet ready for practical use and apply some extra settings. These two branches diverged sometime in the past.

Our feature branches are based on dev. If the feature needs to be in release we need to merge it there, too — and that’s a problem: Git will put lots of the dev specific commits into release while we want it to only merge the changes from the feature branch.

Currently we manage this with a lot of cherry-picks which isn’t very practical. I’m aware that there is a simple way to merge up to a certain commit (/a/8223166/2733244) but is there something similar for a start commit? Or some rebase trick?