diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-26 00:13:38 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-26 00:13:39 +0300 |
| commit | 21bed620cd2d4fc4fb3d42447136c9f899ede5bb (patch) | |
| tree | 55fe7e104798ec1689d4e3513e81563a0188317f /Documentation/config.txt | |
| parent | fc08d2d4add543b88d7e1573cb4be01adedfed00 (diff) | |
| parent | 1335d76e4569fa84e52dc24c88c04daeae6e160e (diff) | |
Merge branch 'jc/renormalize-merge-kill-safer-crlf'
"git merge" with renormalization did not work well with
merge-recursive, due to "safer crlf" conversion kicking in when it
shouldn't.
* jc/renormalize-merge-kill-safer-crlf:
merge: avoid "safer crlf" during recording of merge results
convert: unify the "auto" handling of CRLF
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index e455faeb23..8b1aee4b3b 100644 --- a/Documentation/config.txt +++ b/Documentation/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:: |