6996 |
substitution mode. The former is set by the @samp{-k} |
substitution mode. The former is set by the @samp{-k} |
6997 |
option to @code{cvs add} and @code{cvs admin}; the |
option to @code{cvs add} and @code{cvs admin}; the |
6998 |
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 |
6999 |
checkout} or @code{cvs update}. @code{cvs diff} also |
checkout} or @code{cvs update}. |
7000 |
has a @samp{-k} option. For some examples, |
@code{cvs diff} and @code{cvs rdiff} also |
7001 |
|
have @samp{-k} options. |
7002 |
|
For some examples, |
7003 |
see @ref{Binary files}, and @ref{Merging and keywords}. |
see @ref{Binary files}, and @ref{Merging and keywords}. |
7004 |
@c The fact that -A is overloaded to mean both reset |
@c The fact that -A is overloaded to mean both reset |
7005 |
@c sticky options and reset sticky tags/dates is |
@c sticky options and reset sticky tags/dates is |
8154 |
commands on the same file until you specify otherwise. |
commands on the same file until you specify otherwise. |
8155 |
|
|
8156 |
The @samp{-k} option is available with the @code{add}, |
The @samp{-k} option is available with the @code{add}, |
8157 |
@code{checkout}, @code{diff}, @code{import} and |
@code{checkout}, @code{diff}, @code{rdiff}, @code{import} and |
8158 |
@code{update} commands. |
@code{update} commands. |
8159 |
|
|
8160 |
@item -l |
@item -l |
10509 |
If no matching revision is found, retrieve the most |
If no matching revision is found, retrieve the most |
10510 |
recent revision (instead of ignoring the file). |
recent revision (instead of ignoring the file). |
10511 |
|
|
10512 |
|
@item -k @var{kflag} |
10513 |
|
Process keywords according to @var{kflag}. See |
10514 |
|
@ref{Keyword substitution}. |
10515 |
|
|
10516 |
@item -l |
@item -l |
10517 |
Local; don't descend subdirectories. |
Local; don't descend subdirectories. |
10518 |
|
|