summaryrefslogtreecommitdiffstats
path: root/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-25 15:49:42 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-25 15:49:42 -0700
commiteed15affdc439fd40e863849b0a56b93c58690ac (patch)
treeecf7d886571027e8cc5a7007bdf835635d28a1a8 /config.txt
parent1a1b8478e1973c7362e8f5f6b2fc1f56b2a25204 (diff)
downloadgit-htmldocs-eed15affdc439fd40e863849b0a56b93c58690ac.tar.gz
Autogenerated HTML docs for v2.9.2-466-g8c6d1
Diffstat (limited to 'config.txt')
-rw-r--r--config.txt12
1 files changed, 5 insertions, 7 deletions
diff --git a/config.txt b/config.txt
index e455faeb2..8b1aee4b3 100644
--- a/config.txt
+++ b/config.txt
@@ -412,13 +412,11 @@ file with mixed line endings would be reported by the `core.safecrlf`
mechanism.
core.autocrlf::
- Setting this variable to "true" is almost the same as setting
- the `text` attribute to "auto" on all files except that text
- files are not guaranteed to be normalized: files that contain
- `CRLF` in the repository will not be touched. Use this
- setting if you want to have `CRLF` line endings in your
- working directory even though the repository does not have
- normalized line endings. This variable can be set to 'input',
+ Setting this variable to "true" is the same as setting
+ the `text` attribute to "auto" on all files and core.eol to "crlf".
+ Set to true if you want to have `CRLF` line endings in your
+ working directory and the repository has LF line endings.
+ This variable can be set to 'input',
in which case no output conversion is performed.
core.symlinks::