Backport changes from renamed file

Question

I have two branches: trunk, production. I have found a problem in trunk, made fix and committed it, pushed it. Now it was tested and I need do merge changes into the product

Answer 1

To cherry pick changes to any number of files, in case of a directory rename between branches:

git diff ... | sed -e 's|||' | git apply -