[PATCH 1/2] gitattributes.txt: Remove a duplicated paragraph about 'ident' and 'crlf' interaction.
From: Johannes Sixt <hidden>
Date: 2016-06-15 22:43:36
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
The order in which 'ident' and 'crlf' are carried out is documented a few paragraphs later again, after 'filter' was introduced. Signed-off-by: Johannes Sixt <redacted> --- I don't have the tools to check whether the formatting is still correct. -- Hannes Documentation/gitattributes.txt | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index d0e951e..168a598 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt@@ -145,17 +145,6 @@ sign `$` upon checkout. Any byte sequence that begins with with `$Id$` upon check-in. -Interaction between checkin/checkout attributes -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -In the check-in codepath, the worktree file is first converted -with `ident` (if specified), and then with `crlf` (again, if -specified and applicable). - -In the check-out codepath, the blob content is first converted -with `crlf`, and then `ident`. - - `filter` ^^^^^^^^
--
1.5.3.3.gcc9e