diff options
author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-02-03 23:00:43 +0000 |
---|---|---|
committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-02-03 23:00:43 +0000 |
commit | dc1dc8a88809efb533fdfdc6ee8e8e9d54ae09e9 (patch) | |
tree | b06b775a712951cb8d26106e6847a8a48003e955 /usr.bin/cvs | |
parent | a3d25c7be83454a7904420b003d5fda2ec877d39 (diff) |
be more consistent everywhere with `-k mode' option;
ok jfb@ jmc@ Joris Vink;
Diffstat (limited to 'usr.bin/cvs')
-rw-r--r-- | usr.bin/cvs/cvs.1 | 8 | ||||
-rw-r--r-- | usr.bin/cvs/cvs.c | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/usr.bin/cvs/cvs.1 b/usr.bin/cvs/cvs.1 index 6a5a94e9b45..ba87b1f7eda 100644 --- a/usr.bin/cvs/cvs.1 +++ b/usr.bin/cvs/cvs.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cvs.1,v 1.40 2005/02/03 22:29:07 xsa Exp $ +.\" $OpenBSD: cvs.1,v 1.41 2005/02/03 23:00:41 xsa Exp $ .\" .\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> .\" Copyright (c) 2004, 2005 Xavier Santolaria <xsa@openbsd.org> @@ -209,7 +209,8 @@ The command takes the following options: .Bl -tag -width Ds -offset 3n .It Fl A -Reset any sticky tags, dates, or kopts that have been set on the tree. +Reset any sticky tags, dates, or keyword substitution modes that +have been set on the tree. .It Fl c Display the list of available modules. .It Fl D Ar date @@ -784,7 +785,8 @@ The command takes the following options: .Bl -tag -width Ds -offset 3n .It Fl A -Reset any sticky tags, dates, or kopts that have been set on the tree. +Reset any sticky tags, dates, or keyword substitution modes that +have been set on the tree. .It Fl D Ar date Update as of the latest revision no later than .Ar date diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c index 7c69bbc2c4d..13b7b594906 100644 --- a/usr.bin/cvs/cvs.c +++ b/usr.bin/cvs/cvs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.c,v 1.38 2005/01/24 18:48:23 jfb Exp $ */ +/* $OpenBSD: cvs.c,v 1.39 2005/02/03 23:00:42 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -117,7 +117,7 @@ static struct cvs_cmd { }, { CVS_OP_CHECKOUT, "checkout", { "co", "get" }, cvs_checkout, - "[-AcflNnPpRs] [-D date | -r rev] [-d dir] [-j rev] [-k kopt] " + "[-AcflNnPpRs] [-D date | -r rev] [-d dir] [-j rev] [-k mode] " "[-t id] module ...", "AcD:d:fj:k:lNnPRr:st:", "Checkout sources for editing", @@ -275,7 +275,7 @@ static struct cvs_cmd { }, { CVS_OP_UPDATE, "update", { "up", "upd" }, cvs_update, - "[-ACdflPpR] [-D date | -r rev] [-I ign] [-j rev] [-k kopt] " + "[-ACdflPpR] [-D date | -r rev] [-I ign] [-j rev] [-k mode] " "[-t id] ...", "", "Bring work tree in sync with repository", |