Skip to content

Commit 842c912

Browse files
committed
Merge branch 'po/doc-add-renormalize' into maint
Documentation for "git add --renormalize" has been improved. source: <[email protected]> * po/doc-add-renormalize: doc add: renormalize is not idempotent for CRCRLF
2 parents 7be9f3f + efae7ce commit 842c912

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)