diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:35:51 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:35:52 -0700 |
commit | 7f5885ad2abfbf9b760e2f32f70537d1c380734d (patch) | |
tree | f2a636bb35db7ea784c2ae08259cfca6bfb6a1a6 /Documentation/config.txt | |
parent | Merge branch 'jk/common-main' into maint (diff) | |
parent | merge: avoid "safer crlf" during recording of merge results (diff) | |
download | tgif-7f5885ad2abfbf9b760e2f32f70537d1c380734d.tar.xz |
Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint
"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 6ad3eb66df..f4721a048b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -405,13 +405,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:: |