From: Johannes Sixt Date: Tue, 25 Sep 2007 13:05:28 +0000 (+0200) Subject: gitattributes.txt: Remove a duplicated paragraph about 'ident' and 'crlf' interaction. X-Git-Tag: v1.5.3.3~10 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2dbbc45730cd85e311a1bff38a07148a423a4f1e;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 46f9d591a..676f694f8 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` ^^^^^^^^