diff options
| author | Johannes Sixt <johannes.sixt@telecom.at> | 2007-09-25 15:05:28 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-25 17:37:31 -0700 |
| commit | 2dbbc45730cd85e311a1bff38a07148a423a4f1e (patch) | |
| tree | aa5be98ce434ec42990c320fa598cacacf518fdb /Documentation/gitattributes.txt | |
| parent | 6dd14366d9478fdb3b459e1b39e384deb5f38f9f (diff) | |
| download | git-2dbbc45730cd85e311a1bff38a07148a423a4f1e.tar.gz git-2dbbc45730cd85e311a1bff38a07148a423a4f1e.tar.xz | |
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>
Diffstat (limited to 'Documentation/gitattributes.txt')
| -rw-r--r-- | Documentation/gitattributes.txt | 11 |
1 files changed, 0 insertions, 11 deletions
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` ^^^^^^^^ |