diff options
author | Justin Frankel <justin@cockos.com> | 2010-08-26 09:51:47 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-08-27 21:08:50 +0400 |
commit | 4e5dd044c62f2a82de083e7cd46cad7b0d3465ae (patch) | |
tree | 69572d24b83de38c7b973b6a73022537ee651fe0 /rerere.c | |
parent | 58a1ece478c6038a7eb0b6e494d563bd5e6d5978 (diff) |
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>
Diffstat (limited to 'rerere.c')
0 files changed, 0 insertions, 0 deletions