From: Junio C Hamano Date: Wed, 25 Oct 2017 01:51:41 GMT Subject: Re: Consequences of CRLF in index? Message-ID: In-Reply-To: <20171024181415.3tvmc36aqi335v66@aiede.mtv.corp.google.com> Jonathan Nieder writes: > I'd be interested to hear what happens when diff-ing across a line > ending fixup commit. Is this an area where Git needs some > improvement? "git merge" knows an -Xrenormalize option to deal with a > related problem --- it's possible that "git diff" needs to learn a > similar trick. My knee-jerk reaction is that (1) the end user definitely wants to see preimage and postimage lines are different in such a commit by default, one side has and the other side lacks ^M at the end., and (2) one of the "whitespace ignoring" options (namely, "ignore space at eol") may suffice, but if not, it should be easy to invent a new one "ignore CR at eol".