Cherry-pick with ignore whitespace / line-endings

git, line-endings, linux

Solution

So, for completeness, the answer is that the `ignore-all-space` merge strategy does the job:

git cherry-pick -X ignore-all-space <commit-id>

And that will let you painlessly cherry-pick commits made when the file had, eg, windows line endings onto a version that has unix file endings.

Problem

is there a way to tell `git cherry-pick` to use the `renormalize` merge strategy? I'm not sure the `-X` option is working. I have a bunch of commits that seem to assume one type of line ending, and I'm trying to apply them to a branch that assumes another. Not having a good time...

Original source