cloud
/
git
mirror of git://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git ls-files: text=auto eol=lf is supported in Git 2.10 

The man page for `git ls-files --eol` mentions the combination
of text attributes "text=auto eol=lf" or "text=auto eol=crlf" as not
supported yet, but may be in the future.

Now they are supported.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Torsten Bögershausen 2016-08-25 17:52:57 +02:00 committed by Junio C Hamano
parent 2632c897f7
commit 41a616dada
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-ls-files.txt
View File

@ -159,8 +159,7 @@ not accessible in the working tree.
+ +
<eolattr> is the attribute that is used when checking out or committing, <eolattr> is the attribute that is used when checking out or committing,
it is either "", "-text", "text", "text=auto", "text eol=lf", "text eol=crlf". it is either "", "-text", "text", "text=auto", "text eol=lf", "text eol=crlf".
Note: Currently Git does not support "text=auto eol=lf" or "text=auto eol=crlf", Since Git 2.10 "text=auto eol=lf" and "text=auto eol=crlf" are supported.
that may change in the future.
+ +
Both the <eolinfo> in the index ("i/<eolinfo>") Both the <eolinfo> in the index ("i/<eolinfo>")
and in the working tree ("w/<eolinfo>") are shown for regular files, and in the working tree ("w/<eolinfo>") are shown for regular files,