[Top][All Lists]

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

[Cvs-cvs] Changes to ccvs/doc/cvs.texinfo [cvs1-11-x-branch]

From: Larry Jones
Subject: [Cvs-cvs] Changes to ccvs/doc/cvs.texinfo [cvs1-11-x-branch]
Date: Thu, 22 Sep 2005 16:08:56 -0400

Index: ccvs/doc/cvs.texinfo
diff -u ccvs/doc/cvs.texinfo:1.545.2.57 ccvs/doc/cvs.texinfo:1.545.2.58
--- ccvs/doc/cvs.texinfo:1.545.2.57     Tue Sep 20 18:35:57 2005
+++ ccvs/doc/cvs.texinfo        Thu Sep 22 20:08:54 2005
@@ -6996,8 +6996,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
@@ -8152,7 +8154,7 @@
 commands on the same file until you specify otherwise.
 The @samp{-k} option is available with the @code{add},
address@hidden, @code{diff}, @code{import} and
address@hidden, @code{diff}, @code{rdiff}, @code{import} and
 @code{update} commands.
 @item -l
@@ -10506,6 +10508,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]