Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
gitattributes.txt: Remove a duplicated paragraph about 'ident' and 'crlf' interaction.
author
Johannes Sixt
<johannes.sixt@telecom.at>
Tue, 25 Sep 2007 13:05:28 +0000
(15:05 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 26 Sep 2007 00:37:31 +0000
(17:37 -0700)
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>
Documentation/gitattributes.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
6dd1436
)
diff --git
a/Documentation/gitattributes.txt
b/Documentation/gitattributes.txt
index 46f9d591aa7a3af2235d29308d101b2bfa0bff56..676f694f82647699f2ba84259c267339f9bfa957 100644
(file)
--- 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`
^^^^^^^^