gistfile1.txt

We work in release branches (rel_0052) for a given release.  As we work on that
branch, we commit with the following format:

  [PAIR INITIALS] [PIVOTAL STORY ID] Short summary of commit

We have a problem where the business wants a subset of the commits made on this 
branch released to production (with all commits released at a later date).  Let's 
say they want all stories with the pivotal ID 5193923 in the next release, and 
nothing else.  Version v18.20.11 is currently in production.

The process we came up with:

git checkout -b prod_fix v18.20.11
git merge rel_0052 (pull all the commits)
git rebase -i v18.20.11 (delete all commits not related to 5193923)

This works, however, it makes it difficult to merge the prod_fix branch back into 
rel_0052 or future branches (lots of merge conflicts).

Is there a better way to do this?