diff options
| author | Torsten Bögershausen <tboegi@web.de> | 2016-08-25 17:52:57 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-25 13:38:18 -0700 |
| commit | 41a616dadaf2a7445ea7c3f5d77a20337af4de90 (patch) | |
| tree | a6eb07c3c576eb9c99382074e6688254914a4b60 | |
| parent | 2632c897f74b1cc9b5533f467da459b9ec725538 (diff) | |
| download | git-41a616dadaf2a7445ea7c3f5d77a20337af4de90.tar.gz git-41a616dadaf2a7445ea7c3f5d77a20337af4de90.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-ls-files.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 078b55666..0d933ac35 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -159,8 +159,7 @@ not accessible in the working tree. + <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". -Note: Currently Git does not support "text=auto eol=lf" or "text=auto eol=crlf", -that may change in the future. +Since Git 2.10 "text=auto eol=lf" and "text=auto eol=crlf" are supported. + Both the <eolinfo> in the index ("i/<eolinfo>") and in the working tree ("w/<eolinfo>") are shown for regular files, |