7424 |
substitution mode. The former is set by the @samp{-k} |
substitution mode. The former is set by the @samp{-k} |
7425 |
option to @code{cvs add} and @code{cvs admin}; the |
option to @code{cvs add} and @code{cvs admin}; the |
7426 |
latter is set by the @samp{-k} or @samp{-A} options to @code{cvs |
latter is set by the @samp{-k} or @samp{-A} options to @code{cvs |
7427 |
checkout} or @code{cvs update}. @code{cvs diff} also |
checkout} or @code{cvs update}. |
7428 |
has a @samp{-k} option. For some examples, |
@code{cvs diff} and @code{cvs rdiff} also |
7429 |
|
have @samp{-k} options. |
7430 |
|
For some examples, |
7431 |
see @ref{Binary files}, and @ref{Merging and keywords}. |
see @ref{Binary files}, and @ref{Merging and keywords}. |
7432 |
@c The fact that -A is overloaded to mean both reset |
@c The fact that -A is overloaded to mean both reset |
7433 |
@c sticky options and reset sticky tags/dates is |
@c sticky options and reset sticky tags/dates is |
8628 |
commands on the same files until you specify otherwise. |
commands on the same files until you specify otherwise. |
8629 |
|
|
8630 |
The @samp{-k} option is available with the @code{add}, |
The @samp{-k} option is available with the @code{add}, |
8631 |
@code{checkout}, @code{diff}, @code{export}, @code{import} and |
@code{checkout}, @code{diff}, @code{export}, @code{import}, |
8632 |
@code{update} commands. |
@code{rdiff}, and @code{update} commands. |
8633 |
|
|
8634 |
@strong{WARNING: Prior to CVS version 1.12.2, the @samp{-k} flag |
@strong{WARNING: Prior to CVS version 1.12.2, the @samp{-k} flag |
8635 |
overrode the @samp{-kb} indication for a binary file. This could |
overrode the @samp{-kb} indication for a binary file. This could |
11151 |
If no matching revision is found, retrieve the most |
If no matching revision is found, retrieve the most |
11152 |
recent revision (instead of ignoring the file). |
recent revision (instead of ignoring the file). |
11153 |
|
|
11154 |
|
@item -k @var{kflag} |
11155 |
|
Process keywords according to @var{kflag}. See |
11156 |
|
@ref{Keyword substitution}. |
11157 |
|
|
11158 |
@item -l |
@item -l |
11159 |
Local; don't descend subdirectories. |
Local; don't descend subdirectories. |
11160 |
|
|