Ignore EOL changes during merge/rebase/cherry-pick

[Oliver Buchien]

Is there an easy way to tell Gerrit UI that when cherry-picking a change to
use git merge-strategy flags like *--ignore-cr-at-eol*?

To be clear I do not mean the "ignore-whitespace" flag when editing a
change in Gerrit UI.
I have the use-case, that eol-changes made globally in master branch of my
project but I want to be able to backport changes from master to older
branches but ignoring any changes of eol.
Currently during cherry-pick I get merge-conflicts do to changes of eol.
When doing the cherry-pick on git console with appropriate merge-strategy
set no conflicts occure at all.

Or more general question: Is there a way to configure Gerrits merge
strategy used?

['Björn Pedersen' via Repo and Gerrit Discussion]

Hi,

I don't think there is an 'easy' way to configure this. But you actually
found the practical solution (that also applies to any other
non-conflictfree reasbe/cherry-pick etc.):
Just do it locally and push.

Björn

Post by Oliver Buchien
Is there an easy way to tell Gerrit UI that when cherry-picking a change
to use git merge-strategy flags like *--ignore-cr-at-eol*?
To be clear I do not mean the "ignore-whitespace" flag when editing a
change in Gerrit UI.
I have the use-case, that eol-changes made globally in master branch of my
project but I want to be able to backport changes from master to older
branches but ignoring any changes of eol.
Currently during cherry-pick I get merge-conflicts do to changes of eol.
When doing the cherry-pick on git console with appropriate merge-strategy
set no conflicts occure at all.
Or more general question: Is there a way to configure Gerrits merge
strategy used?