summaryrefslogtreecommitdiffstats
path: root/git-cvsserver.txt
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.txt
parentf5de4cf4e1e8bccd17515d71186e752f4716cac9 (diff)
downloadgit-htmldocs-bb88cf46ef8a2521a253db9ab576e12202a54fa5.tar.gz
Autogenerated HTML docs for v1.7.1-524-g6df2
Diffstat (limited to 'git-cvsserver.txt')
-rw-r--r--git-cvsserver.txt13
1 files changed, 5 insertions, 8 deletions
diff --git a/git-cvsserver.txt b/git-cvsserver.txt
index c27ca4350..7004dd2de 100644
--- a/git-cvsserver.txt
+++ b/git-cvsserver.txt
@@ -369,16 +369,13 @@ By default the server leaves the '-k' mode blank for all files,
which causes the cvs client to treat them as a text files, subject
to crlf conversion on some platforms.
-You can make the server use `crlf` attributes to set the '-k' modes
-for files by setting the `gitcvs.usecrlfattr` config variable.
-In this case, if `crlf` is explicitly unset ('-crlf'), then the
-server will set '-kb' mode for binary files. If `crlf` is set,
-then the '-k' mode will explicitly be left blank. See
-also linkgit:gitattributes[5] for more information about the `crlf`
-attribute.
+You can make the server use the end-of-line conversion attributes to
+set the '-k' modes for files by setting the `gitcvs.usecrlfattr`
+config variable. See linkgit:gitattributes[5] for more information
+about end-of-line conversion.
Alternatively, if `gitcvs.usecrlfattr` config is not enabled
-or if the `crlf` attribute is unspecified for a filename, then
+or the attributes do not allow automatic detection for a filename, then
the server uses the `gitcvs.allbinary` config for the default setting.
If `gitcvs.allbinary` is set, then file not otherwise
specified will default to '-kb' mode. Otherwise the '-k' mode