From: Johannes Sixt <j6t@kdbg•org>
To: "Stefan-W. Hahn" <stefan.hahn@s-hahn•de>, git@vger•kernel.org
Subject: Re: Bug: Problem with CRLF line ending in git-diff with coloring
Date: Sun, 09 Feb 2014 19:30:46 +0100 [thread overview]
Message-ID: <52F7C956.5040604@kdbg.org> (raw)
In-Reply-To: <20140209110155.GB16189@scotty.home>
Am 09.02.2014 12:01, schrieb Stefan-W. Hahn:
> Good morning,
>
> when diffing output where files have CRLF line ending, the coloring
> seems wrong, because in changed lines the CR (^M) is highlighted,
> even if the line ending has not changed.
...
> If WS_CR_AT_EOL is set in ecbdata->ws_rule, it works correctly, but this seems
> not the right solutions.
It's the right solution. IOW, you should place something like this in
your .gitattributes:
*.html whitespace=cr-at-eol
-- Hannes
next prev parent reply other threads:[~2014-02-09 18:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-09 11:01 Bug: Problem with CRLF line ending in git-diff with coloring Stefan-W. Hahn
2014-02-09 18:30 ` Johannes Sixt [this message]
2014-02-14 16:47 ` Stefan-W. Hahn
2014-02-14 21:19 ` Johannes Sixt
2014-02-15 7:21 ` Stefan-W. Hahn
2014-02-14 21:17 ` Stefan-W. Hahn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52F7C956.5040604@kdbg.org \
--to=j6t@kdbg$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=stefan.hahn@s-hahn$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox