(+cc: Eyvind Bernhardsen, resident scholar on LF/CRLF conflicts) Hi! Justin Frankel wrote: > 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). Interesting. The idea seems sane, provided it copes with edge cases well (haven't checked the code yet). I have even wished for a "merge -Xpatience" from time to time. > 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). See Documentation/SubmittingPatches, section labelled "Decide what to base your work on". Generally the rule is to develop features against "master", or on top of a relevant topic branch from "next" or "pu" if your implementation requires features from it (or if it is likely to create heavy conflicts). If the patches seem sane, is it all right if we forge your sign-off? (See Documentation/SubmittingPatches for what this means.) Since the threading does not seem to have worked correctly, here are the patches, for reference. for master: http://thread.gmane.org/gmane.comp.version-control.git/154166 for next: http://thread.gmane.org/gmane.comp.version-control.git/154167 Thanks, Jonathan -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html