On Sun, 27 Sep 2015 23:47:23 -0700
Michael <keybou...@gmail.com> wrote:

> So how do you deal with patches that are mostly wrecked by spacing
> changes?

Try `git merge -s recursive -X ignore-space-change <branch>`?

Please search the git-merge manual page for the "white" keyword.


You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to