summaryrefslogtreecommitdiffstats
path: root/contrib/cvs
diff options
context:
space:
mode:
authordillon <dillon@FreeBSD.org>2001-09-21 19:05:36 +0000
committerdillon <dillon@FreeBSD.org>2001-09-21 19:05:36 +0000
commite67d87ef7cc3107ff0d896d93fca7efa17c82ef4 (patch)
treec70b2c82605fff22cb049c5a1f428fc0b95fe79b /contrib/cvs
parent1020d31fd147a530a195abd84df61376abec26cc (diff)
downloadFreeBSD-src-e67d87ef7cc3107ff0d896d93fca7efa17c82ef4.zip
FreeBSD-src-e67d87ef7cc3107ff0d896d93fca7efa17c82ef4.tar.gz
oops, forgot to commit man page for cvs changes
Diffstat (limited to 'contrib/cvs')
-rw-r--r--contrib/cvs/man/cvs.119
1 files changed, 17 insertions, 2 deletions
diff --git a/contrib/cvs/man/cvs.1 b/contrib/cvs/man/cvs.1
index 395da71..ae7a67e 100644
--- a/contrib/cvs/man/cvs.1
+++ b/contrib/cvs/man/cvs.1
@@ -594,6 +594,16 @@ or
options of
.BR checkout " and " export .
.TP
+.B \-T
+Create/Update CVS/Template by copying it from the (local) repository.
+This option is useful for developers maintaining a local cvs repository
+but commiting to a remote repository. By maintaining CVS/Template the
+remote commits will still be able to bring up the proper template in the
+commit editor session.
+Available with the
+.BR checkout " and " update
+commands.
+.TP
.B \-p
Pipe the files retrieved from the repository to standard output,
rather than writing them in the current directory. Available with the
@@ -1081,7 +1091,7 @@ Others would simply do
.` "cvs checkout -rEXPR1 whatever_module"
to work with you on the experimental change.
.TP
-\fBdiff\fP [\fB\-kl\fP] [\fIrcsdiff_options\fP] [[\fB\-r\fP \fIrev1\fP | \fB\-D\fP \fIdate1\fP] [\fB\-r\fP \fIrev2\fP | \fB\-D\fP \fIdate2\fP]] [\fIfiles.\|.\|.\fP]
+\fBdiff\fP [\fB\-kl\fP] [\fIrcsdiff_options\fP] [[\fB\-r\fP \fIrev1\fP | \fB\-D\fP \fIdate1\fP | \fB\-j\fP \fIrev1:date1\fP] [\fB\-r\fP \fIrev2\fP | \fB\-D\fP \fIdate2\fP | \fB\-j\fP \fIrev2:date2\fP]] [\fIfiles.\|.\|.\fP]
.I Requires:
working directory, repository.
.br
@@ -1104,11 +1114,16 @@ twice, you can see differences between two revisions in the
repository.
You can also specify
.B \-D
-options to diff against a revision in the past.
+options to diff against a revision (on the head branch) in the past, and
+you can also specify
+.B \-j
+options to diff against a revision relative to a branch tag in the past.
The
.B \-r
and
.B \-D
+and
+.B \-j
options can be mixed together with at most two options ever specified.
.SP
See
OpenPOWER on IntegriCloud