@matheusbsbs / matheus-bagliano / commits / 2dbbc45730
Fork 0

gitattributes.txt: Remove a duplicated paragraph about 'ident' and 'crlf' interaction.

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 <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Sixt committed Sep 25, 2007 at 15:05 UTC 2dbbc45730cd85e311a1bff38a07148a423a4f1e
1 file changed -11
Documentation/gitattributes.txt
-11
@@ -145,17 +145,6 @@ sign `$` upon checkout. Any byte sequence that begins with
145 with `$Id$` upon check-in.
146
147
148 -Interaction between checkin/checkout attributes
149 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
150 -
151 -In the check-in codepath, the worktree file is first converted
152 -with `ident` (if specified), and then with `crlf` (again, if
153 -specified and applicable).
154 -
155 -In the check-out codepath, the blob content is first converted
156 -with `crlf`, and then `ident`.
157 -
158 -
148 `filter`
149 ^^^^^^^^
150