From: Junio C Hamano <gitster@pobox.com>
To: "Torsten Bögershausen" <tboegi@web.de>
Cc: Martin Langhoff <martin.langhoff@gmail.com>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: osx autocrlf sanity?
Date: Wed, 10 Jun 2020 10:06:35 -0700 [thread overview]
Message-ID: <xmqqmu5ag89w.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200610143404.5sgww2fmsouubloj@tb-raspi4> ("Torsten Bögershausen"'s message of "Wed, 10 Jun 2020 16:34:04 +0200")
Torsten Bögershausen <tboegi@web.de> writes:
> On Tue, Jun 09, 2020 at 07:31:23PM -0400, Martin Langhoff wrote:
>> Hi Brian,
>>
>> good question! There is a .gitattributes file, all the files affected
>> have these attributes
>>
>> *.py text diff=python
>
> That is the important information, that we need.
> Since there is a .gitattributes file, (wich is good),
> you can forget about core.autocrlf (at least for all python files).
> (That should be clear from the documentation of Git,
> but it could be, that we can make things more clear).
So a "text" attribute trumps the settings of autocrlf? That makes
it sound like ...
> There is only one way out of this dilemma:
> renormalize the line endings in the repo (and live a happier life ;-)
... there is another way out, which is to drop "text" attribute?
prev parent reply other threads:[~2020-06-10 17:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-09 19:52 osx autocrlf sanity? Martin Langhoff
2020-06-09 23:13 ` brian m. carlson
2020-06-09 23:31 ` Martin Langhoff
2020-06-10 0:03 ` brian m. carlson
2020-06-10 13:55 ` Martin Langhoff
2020-06-10 13:59 ` Randall S. Becker
2020-06-10 14:19 ` Martin Langhoff
2020-06-10 23:53 ` brian m. carlson
2020-06-10 14:34 ` Torsten Bögershausen
2020-06-10 14:51 ` Martin Langhoff
2020-06-10 17:06 ` Junio C Hamano [this message]
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=xmqqmu5ag89w.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=martin.langhoff@gmail.com \
--cc=sandals@crustytoothpaste.net \
--cc=tboegi@web.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).