summaryrefslogtreecommitdiffstats
path: root/git-cvsserver.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-06-21 15:23:55 +0000
committerJunio C Hamano <junio@kernel.org>2010-06-21 15:23:55 +0000
commitbb88cf46ef8a2521a253db9ab576e12202a54fa5 (patch)
treebbc5092df07bff8072a1d42a422ab68b4dbd7aac /git-cvsserver.html
parentf5de4cf4e1e8bccd17515d71186e752f4716cac9 (diff)
downloadgit-htmldocs-bb88cf46ef8a2521a253db9ab576e12202a54fa5.tar.gz
Autogenerated HTML docs for v1.7.1-524-g6df2
Diffstat (limited to 'git-cvsserver.html')
-rw-r--r--git-cvsserver.html15
1 files changed, 6 insertions, 9 deletions
diff --git a/git-cvsserver.html b/git-cvsserver.html
index 0eb80de6b..a18daa39a 100644
--- a/git-cvsserver.html
+++ b/git-cvsserver.html
@@ -784,15 +784,12 @@ Exports and tagging (tags and branches) are not supported at this stage.</p></di
<div class="para"><p>By default the server leaves the <em>-k</em> mode blank for all files,
which causes the cvs client to treat them as a text files, subject
to crlf conversion on some platforms.</p></div>
-<div class="para"><p>You can make the server use <tt>crlf</tt> attributes to set the <em>-k</em> modes
-for files by setting the <tt>gitcvs.usecrlfattr</tt> config variable.
-In this case, if <tt>crlf</tt> is explicitly unset (<em>-crlf</em>), then the
-server will set <em>-kb</em> mode for binary files. If <tt>crlf</tt> is set,
-then the <em>-k</em> mode will explicitly be left blank. See
-also <a href="gitattributes.html">gitattributes(5)</a> for more information about the <tt>crlf</tt>
-attribute.</p></div>
+<div class="para"><p>You can make the server use the end-of-line conversion attributes to
+set the <em>-k</em> modes for files by setting the <tt>gitcvs.usecrlfattr</tt>
+config variable. See <a href="gitattributes.html">gitattributes(5)</a> for more information
+about end-of-line conversion.</p></div>
<div class="para"><p>Alternatively, if <tt>gitcvs.usecrlfattr</tt> config is not enabled
-or if the <tt>crlf</tt> attribute is unspecified for a filename, then
+or the attributes do not allow automatic detection for a filename, then
the server uses the <tt>gitcvs.allbinary</tt> config for the default setting.
If <tt>gitcvs.allbinary</tt> is set, then file not otherwise
specified will default to <em>-kb</em> mode. Otherwise the <em>-k</em> mode
@@ -835,7 +832,7 @@ Martin Langhoff &lt;martin@catalyst.net.nz&gt;
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-06-13 19:56:32 UTC
+Last updated 2010-06-21 15:23:40 UTC
</div>
</div>
</body>