Cherry-pick with ignore whitespace / line-endings

linux git line-endings
hwjp picture hwjp · Jul 16, 2014 · Viewed 8.5k times · Source

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...

Answer

hwjp picture hwjp · Nov 20, 2014

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.

Related questions

Git status ignore line endings / identical files / windows & linux environment / dropbox / mled

How do I make git status ignore line ending differences? Background info: I use randomly Windows and Linux to work on the project. The project is in Dropbox. I found a lot about how do make git diff ignore line …

Read More
Git asks for username every time I push

Whenever I try to push into my repo git asks for both username & password. I have no problem in re-entering my password each time but the problem is in entering username. I use https to clone my repository. So, …

Read More
"Unable to find remote helper for 'https'" during git clone

I am unable to clone HTTPS repositories. I can clone SSH repos fine, but not HTTPS repos. I cannot test the GIT protocol since I am behind a corporate firewall. This is what I am trying to do: $ git clone …

Read More