diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-06-28 08:44:45 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-06-28 08:44:45 +0000 |
| commit | f1db92f1fb84390c3917f40e5735ebe9586b0b87 (patch) | |
| tree | 20f6540c943b04368b273d7cddc6669913cd49d3 | |
| parent | 93f6c31358839ce6ca63ec9eb8979e090985da1e (diff) | |
- fix commands usage
- fix rdiff aliases
ok joris
| -rw-r--r-- | usr.bin/cvs/diff.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index b9954a8afa3..b8b32ef37d9 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.42 2005/06/05 20:47:44 joris Exp $ */ +/* $OpenBSD: diff.c,v 1.43 2005/06/28 08:44:44 xsa Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -337,8 +337,9 @@ struct cvs_cmd cvs_cmd_diff = { CVS_OP_DIFF, CVS_REQ_DIFF, "diff", { "di", "dif" }, "Show differences between revisions", - "[-cilNnpu] [-D date] [-r rev] ...", - "cD:ilNnpr:Ru", + "[-cilNnpu] [[-D date] [-r rev] [-D date2 | -r rev2]] " + "[-k mode] [file ...]", + "cD:iklNnpr:Ru", NULL, CF_RECURSE | CF_IGNORE | CF_SORT | CF_KNOWN, cvs_diff_init, @@ -353,10 +354,11 @@ struct cvs_cmd cvs_cmd_diff = { struct cvs_cmd cvs_cmd_rdiff = { CVS_OP_RDIFF, CVS_REQ_DIFF, "rdiff", - { "di", "dif" }, + { "pa", "patch" }, "Create 'patch' format diffs between releases", - "", - "", + "[-flR] [-c | -u] [-s | -t] [-V ver] -D date | -r rev " + "[-D date2 | -rev2] module ...", + "cD:flRr:stuV:", NULL, CF_RECURSE | CF_IGNORE | CF_SORT | CF_KNOWN, cvs_diff_init, |