diff options
| author | Matthew Ogilvie <mmogilvi_git@miniinfo.net> | 2008-05-14 22:35:47 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-16 12:00:31 -0700 |
| commit | 8a06a632976ead891115ad9ac9dea7b99c52158e (patch) | |
| tree | 7e27776b28adcd37d36db97e488c5ac4534136cf /Documentation/git-cvsserver.txt | |
| parent | 044182ef82f1a371c469a26a6d64c7b823aea764 (diff) | |
| download | git-8a06a632976ead891115ad9ac9dea7b99c52158e.tar.gz git-8a06a632976ead891115ad9ac9dea7b99c52158e.tar.xz | |
implement gitcvs.usecrlfattr
If gitcvs.usecrlfattr is set to true, git-cvsserver will consult
the "crlf" for each file to determine if it should mark the file
as binary (-kb).
Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-cvsserver.txt')
| -rw-r--r-- | Documentation/git-cvsserver.txt | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt index b1106714b..4888b8604 100644 --- a/Documentation/git-cvsserver.txt +++ b/Documentation/git-cvsserver.txt @@ -301,11 +301,27 @@ 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 +will set '-kb' mode, for binary files. If it `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` for the default setting. +If `gitcvs.allbinary` is set, then the files not otherwise +specified will default to '-kb' mode. Otherwise the '-k' mode +is left blank. Dependencies ------------ |