Re: [PATCH v7 07/10] convert: unify the "auto" handling of CRLF

2016-04-26 Thread Junio C Hamano
Torsten Bögershausen writes: >>> diff --git a/convert.c b/convert.c >>> index 24ab095..3782172 100644 >>> --- a/convert.c >>> +++ b/convert.c >>> @@ -227,7 +227,9 @@ static enum eol output_eol(enum crlf_action crlf_action) >>> return EOL_LF; >>> case

Re: [PATCH v7 07/10] convert: unify the "auto" handling of CRLF

2016-04-26 Thread Torsten Bögershausen
On 25.04.16 21:37, Junio C Hamano wrote: > tbo...@web.de writes: Thanks for review. Some comments are inline, and a suggestion to a new commit message at the end. [] >> diff --git a/Documentation/config.txt b/Documentation/config.txt >> index 4a27ad4..9caf6ae 100644 >> ---

Re: [PATCH v7 07/10] convert: unify the "auto" handling of CRLF

2016-04-25 Thread Junio C Hamano
tbo...@web.de writes: > From: Torsten Bögershausen > > Before this change, > $ echo "* text=auto" >.gitattributes > $ echo "* eol=crlf" >>.gitattributes > > would have the same effect as > $ echo "* text" >.gitattributes > $ git config core.eol crlf > > Since the 'eol' attribute

[PATCH v7 07/10] convert: unify the "auto" handling of CRLF

2016-04-25 Thread tboegi
From: Torsten Bögershausen Before this change, $ echo "* text=auto" >.gitattributes $ echo "* eol=crlf" >>.gitattributes would have the same effect as $ echo "* text" >.gitattributes $ git config core.eol crlf Since the 'eol' attribute had higher priority than 'text=auto', this