[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Cvs-cvs] Changes to ccvs/doc/cvs.texinfo

From: Larry Jones
Subject: [Cvs-cvs] Changes to ccvs/doc/cvs.texinfo
Date: Thu, 22 Sep 2005 19:27:52 -0400

Index: ccvs/doc/cvs.texinfo
diff -u ccvs/doc/cvs.texinfo:1.665 ccvs/doc/cvs.texinfo:1.666
--- ccvs/doc/cvs.texinfo:1.665  Tue Sep 20 18:37:33 2005
+++ ccvs/doc/cvs.texinfo        Thu Sep 22 23:27:50 2005
@@ -7424,8 +7424,10 @@
 substitution mode.  The former is set by the @samp{-k}
 option to @code{cvs add} and @code{cvs admin}; the
 latter is set by the @samp{-k} or @samp{-A} options to @code{cvs
-checkout} or @code{cvs update}.  @code{cvs diff} also
-has a @samp{-k} option.  For some examples,
+checkout} or @code{cvs update}.
address@hidden diff} and @code{cvs rdiff} also
+have @samp{-k} options.
+For some examples,
 see @ref{Binary files}, and @ref{Merging and keywords}.
 @c The fact that -A is overloaded to mean both reset
 @c sticky options and reset sticky tags/dates is
@@ -8626,8 +8628,8 @@
 commands on the same files until you specify otherwise.
 The @samp{-k} option is available with the @code{add},
address@hidden, @code{diff}, @code{export}, @code{import} and
address@hidden commands.
address@hidden, @code{diff}, @code{export}, @code{import},
address@hidden, and @code{update} commands.
 @strong{WARNING: Prior to CVS version 1.12.2, the @samp{-k} flag
 overrode the @samp{-kb} indication for a binary file.  This could
@@ -11148,6 +11150,10 @@
 @item -f
 If no matching revision is found, retrieve the most
 recent revision (instead of ignoring the file).
address@hidden -k @var{kflag}
+Process keywords according to @var{kflag}.  See
address@hidden substitution}.
 @item -l
 Local; don't descend subdirectories.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]