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: Fri, 14 Feb 2014 22:19:03 +0100 [thread overview]
Message-ID: <52FE8847.8020101@kdbg.org> (raw)
In-Reply-To: <20140214164709.GI7560@pille.home>
Am 14.02.2014 17:47, schrieb Stefan-W. Hahn:
>> It's the right solution. IOW, you should place something like this in
>> your .gitattributes:
>> *.html whitespace=cr-at-eol
>
> Sorry, but this is not possible, because I have files of both sorts (mainly
> C/C++) files in my repository and cannot change the files as I wish.
I'm confused. This setting does not change your files, but instructs git
diff and git apply to not report the trailing CR as white-space error.
Didn't you try it?
-- Hannes
next prev parent reply other threads:[~2014-02-14 21:19 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
2014-02-14 16:47 ` Stefan-W. Hahn
2014-02-14 21:19 ` Johannes Sixt [this message]
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=52FE8847.8020101@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=stefan.hahn@s-hahn.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).