diff options
Diffstat (limited to 'gnu/usr.bin/cvs/man/cvs.1')
| -rw-r--r-- | gnu/usr.bin/cvs/man/cvs.1 | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/gnu/usr.bin/cvs/man/cvs.1 b/gnu/usr.bin/cvs/man/cvs.1 index 515e03217e6..0dad4530f38 100644 --- a/gnu/usr.bin/cvs/man/cvs.1 +++ b/gnu/usr.bin/cvs/man/cvs.1 @@ -192,8 +192,10 @@ Use .I editor to enter revision log information. Overrides the setting of the -.SM CVSEDITOR -and the +.SM CVSEDITOR\c +, +.SM VISUAL\c +, and .SM EDITOR environment variables. .TP @@ -358,6 +360,11 @@ file; see Incorporate a set of updates from off-site into the source repository, as a ``vendor branch''. (Changes repository.) .TP +.B init +Initialize a repository by adding the CVSROOT subdirectory and some default +control files. You must use this command or initialize the repository in +some other way before you can use it. +.TP .B log Display log information. @@ -473,13 +480,6 @@ is available with these commands: .BR checkout ", " export ", " .BR rdiff ", " rtag ", and " update . .TP -.B \-H -Help; describe the options available for this command. This is the -only option supported for -.I all -.B cvs -commands. -.TP \fB\-k\fP \fIkflag\fP Alter the default processing of keywords. @@ -1684,7 +1684,7 @@ executes recursively through subdirectories; you can prevent this by using the standard \fB\-l\fP option, or specify the recursion explicitly by using \fB\-R\fP. .TP -\fBupdate\fP [\fB\-Adf\|lPpQqR\fP] [\fB\-d\fP] [\fB\-r\fP \fItag\fP|\fB\-D\fP \fIdate\fP] \fIfiles\|.\|.\|.\fP +\fBupdate\fP [\fB\-ACdf\|lPpQqR\fP] [\fB\-d\fP] [\fB\-r\fP \fItag\fP|\fB\-D\fP \fIdate\fP] \fIfiles\|.\|.\|.\fP .I Requires: repository, working directory. .br @@ -1841,6 +1841,12 @@ Use .` "\-I !" to avoid ignoring any files at all. .SP +Use the +.` "\-C" +option to overwrite locally modified files with clean copies from +the repository (the modified file is saved in +`\fB.#\fP\fIfile\fP\fB.\fP\fIrevision\fP', however). +.SP The standard \fBcvs\fP command options \fB\-f\fP, \fB\-k\fP, \fB\-l\fP, \fB\-P\fP, \fB\-p\fP, and \fB\-r\fP are also available with \fBupdate\fP. @@ -2035,12 +2041,13 @@ and Specifies the program to use for recording log messages during .BR commit . If not set, the +.SM VISUAL +and .SM EDITOR -environment variable is used instead. -If -.SM EDITOR -is not set either, the default is -.BR /usr/ucb/vi . +environment variables are tried (in that order). +If neither is set, a system-dependent default editor (e.g., +.BR vi ) +is used. .TP .SM CVS_IGNORE_REMOTE_ROOT If this variable is set then |