diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-05-26 01:16:14 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-05-26 01:16:14 +0000 |
| commit | dfccbb0719b88f4df05bf718c6008166dbadea44 (patch) | |
| tree | ddd5483c51044cab7a070039655f0b4074b1dfe6 /git-cvsserver.txt | |
| parent | b713ff1cbf5b9979edaf2b85bfc568fbc37ec0d7 (diff) | |
| download | git-htmldocs-dfccbb0719b88f4df05bf718c6008166dbadea44.tar.gz | |
Autogenerated HTML docs for v1.5.6-rc0
Diffstat (limited to 'git-cvsserver.txt')
| -rw-r--r-- | git-cvsserver.txt | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/git-cvsserver.txt b/git-cvsserver.txt index b1106714b..a33382ec2 100644 --- a/git-cvsserver.txt +++ b/git-cvsserver.txt @@ -301,11 +301,33 @@ checkout, diff, status, update, log, add, remove, commit. Legacy monitoring operations are not supported (edit, watch and related). Exports and tagging (tags and branches) are not supported at this stage. -The server should set the '-k' mode to binary when relevant, however, -this is not really implemented yet. For now, you can force the server -to set '-kb' for all files by setting the `gitcvs.allbinary` config -variable. In proper GIT tradition, the contents of the files are -always respected. No keyword expansion or newline munging is supported. +CRLF Line Ending Conversions +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +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. + +Alternatively, if `gitcvs.usecrlfattr` config is not enabled +or if the `crlf` attribute is unspecified 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 +is left blank. But if `gitcvs.allbinary` is set to "guess", then +the correct '-k' mode will be guessed based on the contents of +the file. + +For best consistency with cvs, it is probably best to override the +defaults by setting `gitcvs.usecrlfattr` to true, +and `gitcvs.allbinary` to "guess". Dependencies ------------ |