1 year ago

#198083

test-img

Miro Kropacek

git cherry-pick/merge without whitespace changes (but without conflicts)

I'm trying to do a simple thing:

git cherry-pick --no-commit <commit with a lot of useless whitespace changes> -Xignore-all-space

Perhaps I'm overlooking something obvious but I can't force git into ignoring any whitespace change from the given commit (mainly trimmed trailing spaces). My understanding is that it is because "-Xignore-all-space" works only for conflict resolution, not like a merge option.

So what works then? I can't be the first person with this issue. git is 2.35.1.

git

merge

removing-whitespace

cherry-pick

0 Answers

Your Answer

Accepted video resources