[PATCH v2 1/2] doc/gitattributes: clarify "autocrlf overrides eol"
- From
Jeff King <peff@peff.net>
- Date
- Jan 29, 2019, 12:41 UTC
- Message-ID
- <20190129124107.GA21931@sigill.intra.peff.net>
- In-Reply-To
- <20190129124031.GA13084@sigill.intra.peff.net>
We only override core.eol with core.autocrlf when the latter is set to something besides "false". Let's make this more clear, and point the reader to the git-config definitions, which discuss this in more detail.
Noticed-by: Sergey Lukashev <lukashev.s@ya.ru> Signed-off-by: Jeff King <peff@peff.net> --- Documentation/gitattributes.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index b8392fc330..ce383e97dc 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -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 directory, use the `eol` attribute for a single file and the `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::
-- 2.20.1.845.g57b86ca485