summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-09-29 23:31:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-29 23:31:40 (GMT)
commitd7da5597a850c721eb0698188696096c8090a85f (patch)
treee4e111340c5ea015699d14562eaab1d475a9ecbb /Documentation/gitattributes.txt
parent5166810b1e16b22e342f2181a3535e70c6e7a119 (diff)
parent552ce11006e39bd07efd79946f180df47aa35b4e (diff)
downloadgit-d7da5597a850c721eb0698188696096c8090a85f.zip
git-d7da5597a850c721eb0698188696096c8090a85f.tar.gz
git-d7da5597a850c721eb0698188696096c8090a85f.tar.bz2
Sync with GIT 1.5.3.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt20
1 files changed, 4 insertions, 16 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index d0e951e..20cf8ff 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`
^^^^^^^^
@@ -175,11 +164,10 @@ but makes the filter a no-op passthru.
The content filtering is done to massage the content into a
shape that is more convenient for the platform, filesystem, and
the user to use. The keyword here is "more convenient" and not
-"turning something unusable into usable". In other words, it is
-"hanging yourself because we gave you a long rope" if your
-project uses filtering mechanism in such a way that it makes
-your project unusable unless the checkout is done with a
-specific filter in effect.
+"turning something unusable into usable". In other words, the
+intent is that if someone unsets the filter driver definition,
+or does not have the appropriate filter program, the project
+should still be usable.
Interaction between checkin/checkout attributes