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>
This commit is contained in:
parent
6dd14366d9
commit
2dbbc45730
@ -145,17 +145,6 @@ sign `$` upon checkout. Any byte sequence that begins with
|
|||||||
with `$Id$` upon check-in.
|
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`
|
`filter`
|
||||||
^^^^^^^^
|
^^^^^^^^
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user