Skip to content

Commit

Permalink
gitattributes.txt: Remove a duplicated paragraph about 'ident' and 'c…
Browse files Browse the repository at this point in the history
…rlf' 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>
  • Loading branch information
Johannes Sixt authored and Junio C Hamano committed Sep 26, 2007
1 parent 6dd1436 commit 2dbbc45
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions Documentation/gitattributes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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`
^^^^^^^^

Expand Down

0 comments on commit 2dbbc45

Please sign in to comment.