From: Justin Frankel <justin@cockos.com>
Date: Thu, 26 Aug 2010 05:51:47 +0000 (-0500)
Subject: merge-recursive: options to ignore whitespace changes
X-Git-Tag: v1.7.4-rc0~168^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4e5dd044c62f2a82de083e7cd46cad7b0d3465ae?hp=4e5dd044c62f2a82de083e7cd46cad7b0d3465ae

merge-recursive: options to ignore whitespace changes

Add support for merging with ignoring line endings (specifically
--ignore-space-at-eol) when using recursive merging.  This is
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>

This can be useful for coping with line-ending damage (Xcode 3.1 has a
nasty habit of converting all CRLFs to LFs, and VC6 tends to just use
CRLFs for inserted lines).

The only option I need is ignore-space-at-eol, but while at it,
include the other xdiff whitespace options (ignore-space-change,
ignore-all-space), too.

[jn: with documentation]

Signed-off-by: Justin Frankel <justin@cockos.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---