From: Steven Grimm <koreth@midwinter.com>
Date: Thu, 28 Jun 2007 18:17:09 GMT
Subject: Re: [PATCH] Ignore end-of-line style when computing similarity score for rename detection
Message-ID: <4683FB25.3080204@midwinter.com>
In-Reply-To: <Pine.LNX.4.64.0706281340090.4438@racer.site>

Johannes Schindelin wrote:
> Somehow I think that this should be triggered by "--ignore-space-at-eol", 
> _and_ be accompanied by a test case.
>   

Should --ignore-space-at-eol be an option to git-merge? Merges are where 
this functionality matters; for simple diffs, --ignore-space-at-eol 
actually already covers it. If we allow that option, should we also 
allow other git-diff options like --ignore-all-space and 
--ignore-space-change? What are the semantics of an autoresolved merge 
with those options in effect -- are they only used for rename detection, 
or do we, e.g., not flag conflicts with only whitespace changes? And if 
we don't, which version do we accept automatically?

-Steve