aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Lichtenheld <frank@lichtenheld.de>2007-04-13 18:02:31 +0200
committerJunio C Hamano <junkio@cox.net>2007-04-13 19:39:28 -0700
commit5cb71f82de7fc370dfcd7aad505c36d89e8fec5d (patch)
tree72eb1f00cc4ada0bfb400f96a94abb57de6e9aad
parenteabb0bfd09031d334152a268c47feb2bc3796a3e (diff)
downloadgit-5cb71f82de7fc370dfcd7aad505c36d89e8fec5d.tar.gz
git-5cb71f82de7fc370dfcd7aad505c36d89e8fec5d.tar.xz
config.txt: Document core.autocrlf
Text shamelessly stolen from the 1.5.1 release notes. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/config.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 061c58562..38831bc90 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -117,6 +117,16 @@ core.fileMode::
the working copy are ignored; useful on broken filesystems like FAT.
See gitlink:git-update-index[1]. True by default.
+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. Currently, which paths to consider
+ "text" (i.e. be subjected to the autocrlf mechanism) is
+ decided purely based on the contents.
+
core.symlinks::
If false, symbolic links are checked out as small plain files that
contain the link text. gitlink:git-update-index[1] and