As far as I understand, the "ort" strategy does not allow turning off rename detection. The best you can do is set the similarity index threshold to 100%. However, it does not address the case of candidate files being exactly the same. So, it seems to me that the only way to do it would be to downgrade to the "recursive" strategy and set the "no-renames" option: git cherry-pick --strategy=recursive --strategy-option=no-renames <commit>... Is my understanding correct? Thanks.