The description for core.autocrlf refers to reads from / writes to the "filesystem". While the term is used elsewhere in the config documentation to refer to the filesystem git is hosted on, it is not only less clear from context in the case of core.autocrlf, but can also be plain inaccurate in many cases. To make more clear the direction of removal / addition of CR when core.crlf is set, as well as to account for the usage of low-level commands such as hash-object or cat-file, we change "reading from the filesystem" to refer instead to "writing to the object database", and "writing to the filesystem" to "output or writing to the work tree" Signed-off-by: Will Palmer <wmpalmer@xxxxxxxxx> --- While I did some simple checks to ensure that my basic assumptions about how the commands I use daily seem to interact with core.autocrlf, I'll easily admit that I don't actually know all the places autocrlf is referenced, so I could be completely wrong about what generalizations can actually be made in the documentation. I'm fine with this patch being included, but it's pretty much just me "being bold" in order to say that I think the way it's currently phrased is wrong and confusing. Documentation/config.txt | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 626b19a..125e9d5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -198,11 +198,11 @@ core.quotepath:: core.autocrlf:: If true, makes git convert `CRLF` at the end of lines in text files to - `LF` when reading from the filesystem, and convert in reverse when - writing to the filesystem. The variable can be set to - 'input', in which case the conversion happens only while - reading from the filesystem but files are written out with - `LF` at the end of lines. A file is considered + `LF` when writing into the object database, and convert in reverse when + outputting those files or writing them to the work tree. The variable + can be set to 'input', in which case the conversion happens only while + writing into the object database, but files are output and written to the + work tree with `LF` at the end of lines. A file is considered "text" (i.e. be subjected to the autocrlf mechanism) based on the file's `crlf` attribute, or if `crlf` is unspecified, based on the file's contents. See linkgit:gitattributes[5]. -- 1.7.1.rc1.248.gcefbb -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html