From: Jeff King <peff@peff.net>
To: "Torsten Bögershausen" <tboegi@web.de>
Cc: Junio C Hamano <gitster@pobox.com>,
Sergey Lukashev <lukashev.s@ya.ru>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: [PATCH v2 1/2] doc/gitattributes: clarify "autocrlf overrides eol"
Date: Tue, 29 Jan 2019 07:41:07 -0500 [thread overview]
Message-ID: <20190129124107.GA21931@sigill.intra.peff.net> (raw)
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
next prev parent reply other threads:[~2019-01-29 12:41 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-27 9:58 unclear docs Sergey Lukashev
2019-01-27 11:55 ` Sergey Lukashev
2019-01-28 16:09 ` Jeff King
2019-01-28 18:12 ` Sergey Lukashev
2019-01-28 18:31 ` Jeff King
2019-01-29 7:38 ` Torsten Bögershausen
2019-01-29 10:28 ` Sergey Lukashev
2019-01-29 12:40 ` [PATCH v2 0/2] eol/autocrlf doc clarifications Jeff King
2019-01-29 12:41 ` Jeff King [this message]
2019-01-29 12:41 ` [PATCH v2 2/2] docs/config: clarify "text property" in core.eol Jeff King
2019-01-28 17:31 ` unclear docs Torsten Bögershausen
2019-01-28 16:06 ` Jeff King
2019-01-28 18:30 ` Junio C Hamano
2019-01-28 18:32 ` Jeff King
2019-01-28 20:16 ` Sergey Lukashev
2019-01-28 20:46 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190129124107.GA21931@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=lukashev.s@ya.ru \
--cc=tboegi@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).