Skip to content

Commit efae7ce

Browse files
PhilipOakleygitster
authored andcommitted
doc add: renormalize is not idempotent for CRCRLF
Bug report https://lore.kernel.org/git/AM0PR02MB56357CC96B702244F3271014E8DC9@AM0PR02MB5635.eurprd02.prod.outlook.com/ noted that a file containing /r/r/n needed renormalising twice. This is by design. Lone CR characters, not paired with an LF, are left unchanged. Note this limitation of the "clean" filter in the documentation. Renormalize was introduced at 9472935 (add: introduce "--renormalize", Torsten Bögershausen, 2017-11-16) Signed-off-by: Philip Oakley <[email protected]> Reviewed-by: Torsten Bögershausen <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent dc8c8de commit efae7ce

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Documentation/git-add.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,9 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files.
188188
forcibly add them again to the index. This is useful after
189189
changing `core.autocrlf` configuration or the `text` attribute
190190
in order to correct files added with wrong CRLF/LF line endings.
191-
This option implies `-u`.
191+
This option implies `-u`. Lone CR characters are untouched, thus
192+
while a CRLF cleans to LF, a CRCRLF sequence is only partially
193+
cleaned to CRLF.
192194

193195
--chmod=(+|-)x::
194196
Override the executable bit of the added files. The executable

0 commit comments

Comments
 (0)