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

I'd use good old patch for this:

git show COMMIT_ID -- old/file/name.txt | patch new/file/name.txt