From: Junio C Hamano <gitster@pobox.com>
To: "Torsten Bögershausen" <tboegi@web.de>
Cc: git@vger.kernel.org
Subject: Re: [ANNOUNCE] Git v2.10.0-rc0
Date: Wed, 17 Aug 2016 10:38:48 -0700 [thread overview]
Message-ID: <xmqqtwej9txz.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqq60qzbebt.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Wed, 17 Aug 2016 08:33:10 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Torsten Bögershausen <tboegi@web.de> writes:
>
>> Is this `text=auto` correct ?
>
> Thanks for spotting a typo. Definitely.
>
>> I think it should be
>>
>> used to have the same effect as
>> $ echo "* text eol=crlf" >.gitattributes
>
> Thanks.
>
>> # In other words, the `auto` was ignored, as explained here:
>> + $ git config core.eol crlf
>> + i.e. declaring all files are text; the combination now is
>> + equivalent to doing
>> + $ git config core.autocrlf true
>> +
Just to make sure I got you right, how does this look?
Documentation/RelNotes/2.10.0.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt
index 179e575..ccf5f64 100644
--- a/Documentation/RelNotes/2.10.0.txt
+++ b/Documentation/RelNotes/2.10.0.txt
@@ -235,13 +235,13 @@ Performance, Internal Implementation, Development Support etc.
* The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
- * The handling of the "text = auto" attribute has been updated.
+ * The handling of the "text=auto" attribute has been corrected.
$ echo "* text=auto eol=crlf" >.gitattributes
used to have the same effect as
- $ echo "* text=auto eol=crlf" >.gitattributes
+ $ echo "* text eol=crlf" >.gitattributes
$ git config core.eol crlf
- i.e. declaring all files are text; the combination now is
- equivalent to doing
+ i.e. declaring all files are text (ignoring "auto"). The
+ combination has been fixed to be equivalent to doing
$ git config core.autocrlf true
* A few tests that specifically target "git rebase -i" have been
--
2.10.0-rc0-144-gf47a5f1
next prev parent reply other threads:[~2016-08-17 17:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-14 22:47 [ANNOUNCE] Git v2.10.0-rc0 Junio C Hamano
2016-08-15 13:59 ` Torsten Bögershausen
2016-08-15 15:42 ` Junio C Hamano
2016-08-17 6:42 ` Torsten Bögershausen
2016-08-17 15:33 ` Junio C Hamano
2016-08-17 17:38 ` Junio C Hamano [this message]
2016-08-17 18:27 ` Torsten Bögershausen
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqtwej9txz.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).