[PATCH 0/2] git-merge: ignore space support

[Justin Frankel <justin@cockos.com>]

Hello,

(Sorry if this is a duplicate, I'm thinking my MIME encoding was causing this 
to get filtered).

I've added  support for merging with ignoring line endings (specifically 
--ignore-space-at-eol) when using recursive merging.  I've added this as a 
strategy-option, so that you can do:

   git merge --strategy-option=ignore-space-at-eol <branch>

and

   git rebase --strategy-option=ignore-space-at-eol <branch>

The only option I needed was ignore-space-at-eol, however it made some sense (to 
me at least) to include the other xdiff options  (ignore-space-change, 
ignore-all-space, patient).

I researched why this wasn't supported already, and only found some vague 
references to why it shouldn't be in there -- if so, I would like to hear that 
explanation (it does seem to me like it should be a good thing to support, even 
if you strongly discourage use of it -- it would have saved me many hours 
yesterday had it been available, but that of course isn't git's fault, but 
Xcode's. ). 

Which branches should we derive from for things like this? The first patch is 
for master, the second for next (there were enough changes in ll-merge that 
the implementations are a bit different).

Thank you for your time, and I'm very happy to be using Git! It is wonderful.

Cheers,

Justin