Junio C Hamano <gitster@xxxxxxxxx> writes:
> Torsten Bögershausen <tboegi@xxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html