Need git rebase -Xignore-all-space to preserve my space

Question

I am doing a rebase of a big change, with a lot of whitespace changes. In order for the merge to work at all, I need -Xignore-all-space.

According to git --help reba

Answer 1

I guess your only option is to use a git merge instead, this way it doesn't swap theirs and ours.