summaryrefslogtreecommitdiffstats
path: root/gitattributes.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-09-30 00:51:14 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-09-30 00:51:14 +0000
commit4fd58d46def7aad5dd382cd20768c4cfcd51aba8 (patch)
treeb22aa7ccfa99b7648da1bb9cf033556cf0b28662 /gitattributes.html
parente59a0072cf9a106b3fd372b42531d9338e668409 (diff)
downloadgit-htmldocs-4fd58d46def7aad5dd382cd20768c4cfcd51aba8.tar.gz
Autogenerated HTML docs for v1.5.3.3-114-g2a85
Diffstat (limited to 'gitattributes.html')
-rw-r--r--gitattributes.html17
1 files changed, 5 insertions, 12 deletions
diff --git a/gitattributes.html b/gitattributes.html
index 5426ddf13..b9f30121d 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -419,12 +419,6 @@ upon checkout.</p>
sign <tt>$</tt> upon checkout. Any byte sequence that begins with
<tt>$Id:</tt> and ends with <tt>$</tt> in the worktree file is replaced
with <tt>$Id$</tt> upon check-in.</p>
-<h4>Interaction between checkin/checkout attributes</h4>
-<p>In the check-in codepath, the worktree file is first converted
-with <tt>ident</tt> (if specified), and then with <tt>crlf</tt> (again, if
-specified and applicable).</p>
-<p>In the check-out codepath, the blob content is first converted
-with <tt>crlf</tt>, and then <tt>ident</tt>.</p>
<h4><tt>filter</tt></h4>
<p>A <tt>filter</tt> attribute can be set to a string value. This names
filter driver specified in the configuration.</p>
@@ -439,11 +433,10 @@ but makes the filter a no-op passthru.</p>
<p>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.</p>
+"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.</p>
<h4>Interaction between checkin/checkout attributes</h4>
<p>In the check-in codepath, the worktree file is first converted
with <tt>filter</tt> driver (if specified and corresponding driver
@@ -709,7 +702,7 @@ commit hash.</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 10-Sep-2007 08:10:47 UTC
+Last updated 30-Sep-2007 00:49:45 UTC
</div>
</div>
</body>