Am 06.12.18 um 01:58 schrieb Junio C Hamano:
> Frank Schäfer writes:
>
>> Just to be sure that I'm not missing anything here:
>> What's your definition of "LF in repository, CRLF in working tree" in
>> terms of config parameters ?
> :::Documentation
Am 03.12.18 um 02:15 schrieb Junio C Hamano:
> Frank Schäfer writes:
>
>> Hi Junio,
>>
>> Am 29.11.18 um 03:11 schrieb Junio C Hamano:
>> [...]
>>> This was misspoken a bit. Let's revise it to
>>>
>>> When producing a colored output
Am 02.12.18 um 22:22 schrieb Johannes Sixt:
> Am 02.12.18 um 20:31 schrieb Frank Schäfer:
>> With other words:
>> "If CR comes immediately before a LF, do the following with *all* lines:
>> after the CR if eol=lf but do not after the CR if
>> eol=crlf.&
Hi Junio,
Am 29.11.18 um 03:11 schrieb Junio C Hamano:
[...]
> This was misspoken a bit. Let's revise it to
>
> When producing a colored output (not limited to whitespace
> error coloring of diff output) for contents that are not
> marked as eol=crlf (and other historical
Am 27.11.18 um 19:15 schrieb Johannes Sixt:
> Am 27.11.18 um 00:31 schrieb Junio C Hamano:
>> Johannes Sixt writes:
>>> Am 26.11.18 um 04:04 schrieb Junio C Hamano:
>>> ... this goes too far, IMO. It is the pager's task to decode control
>>> characters.
>>
>> It was tongue-in-cheek suggestion
Am 27.11.18 um 00:31 schrieb Junio C Hamano:
> Johannes Sixt writes:
>
>> Am 26.11.18 um 04:04 schrieb Junio C Hamano:
>>> That does not sound right. I would understand it if both lines
>>> showed ^M at the end, and only the one on the postimage line had it
>>> highlighted as a
Am 24.11.18 um 23:07 schrieb Johannes Sixt:
> I don't think that there is anything to fix. If you have a file with
> CRLF in it, but you did not declare to Git that CRLF is the expected
> end-of-line indicator, then the CR *is* trailing whitespace (because
> the line ends at LF), and 'git diff'
Am 23.11.18 um 22:47 schrieb Johannes Sixt:
> Am 23.11.18 um 19:19 schrieb Frank Schäfer:
>> The CR marker ^M doesn't show up in '-' lines of diffs when the ending
>> of the removed line is CR+LF.
>> It shows up as expected in '-' lines when the ending of the removed line
>
b
+aaa^Mbbb
CR to LF:
@@ -1 +1,2 @@
-aaa^Mbbb
+aaa
+bbb
Tested with version 2.19.1.
Regards,
Frank Schäfer
Am 14.05.2018 um 20:13 schrieb Torsten Bögershausen:
> ^M is the representation of a "Carriage Return" or CR.
> Under Linux/Unix/Mac OS X a line is terminated with a single
> "line feed", LF.
>
> Windows typically uses CRLF at the end of the line.
> "git diff" uses the LF to detect the end of
What does ^M at the end of lines in the output of 'git diff' mean ?
Thanks,
Frank
11 matches
Mail list logo