undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/autocrlf-overrides-eol-doc'

Browse Source 
Documentation around core.crlf has been updated.

* jk/autocrlf-overrides-eol-doc:
  docs/config: clarify "text property" in core.eol
  doc/gitattributes: clarify "autocrlf overrides eol"
This commit is contained in:
Junio C Hamano 2019-02-06 22:05:23 -08:00
commit 13e263095b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/config/core.txt
View File

@ -121,11 +121,14 @@ core.quotePath::
core.eol:: core.eol::
Sets the line ending type to use in the working directory for Sets the line ending type to use in the working directory for
files that have the `text` property set when core.autocrlf is false. files that are marked as text (either by having the `text`
attribute set, or by having `text=auto` and Git auto-detecting
the contents as text).
Alternatives are 'lf', 'crlf' and 'native', which uses the platform's Alternatives are 'lf', 'crlf' and 'native', which uses the platform's
native line ending. The default value is `native`. See native line ending. The default value is `native`. See
linkgit:gitattributes[5] for more information on end-of-line linkgit:gitattributes[5] for more information on end-of-line
conversion. conversion. Note that this value is ignored if `core.autocrlf`
is set to `true` or `input`.
core.safecrlf:: core.safecrlf::
If true, makes Git check if converting `CRLF` is reversible when If true, makes Git check if converting `CRLF` is reversible when

4
Documentation/gitattributes.txt
View File

@ -124,7 +124,9 @@ text file is normalized, its line endings are converted to LF in the
repository. To control what line ending style is used in the working repository. To control what line ending style is used in the working
directory, use the `eol` attribute for a single file and the directory, use the `eol` attribute for a single file and the
`core.eol` configuration variable for all text files. `core.eol` configuration variable for all text files.
Note that `core.autocrlf` overrides `core.eol` Note that setting `core.autocrlf` to `true` or `input` overrides
`core.eol` (see the definitions of those options in
linkgit:git-config[1]).
Set:: Set::