diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-26 11:13:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-26 11:13:13 -0700 |
| commit | 842c912fc71d63585cdcf5f9c7ad6fc4475648e2 (patch) | |
| tree | 504f76eebd56c5f4fe5f32eacab2ec408e0de03f | |
| parent | Merge branch 'vd/sparse-reset-checkout-fixes' into maint (diff) | |
| parent | doc add: renormalize is not idempotent for CRCRLF (diff) | |
| download | git-842c912fc71d63585cdcf5f9c7ad6fc4475648e2.tar.gz git-842c912fc71d63585cdcf5f9c7ad6fc4475648e2.zip | |
Merge branch 'po/doc-add-renormalize' into maint
Documentation for "git add --renormalize" has been improved.
source: <20220810144450.470-2-philipoakley@iee.email>
* po/doc-add-renormalize:
doc add: renormalize is not idempotent for CRCRLF
| -rw-r--r-- | Documentation/git-add.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 11eb70f16c..9b37f35654 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -188,7 +188,9 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files. forcibly add them again to the index. This is useful after changing `core.autocrlf` configuration or the `text` attribute in order to correct files added with wrong CRLF/LF line endings. - This option implies `-u`. + This option implies `-u`. Lone CR characters are untouched, thus + while a CRLF cleans to LF, a CRCRLF sequence is only partially + cleaned to CRLF. --chmod=(+|-)x:: Override the executable bit of the added files. The executable |