[PATCH 2/8] docs: use `...' instead of `*' for multiplicity
- From
Mark Lodato <lodatom@gmail.com>
- Date
- Dec 18, 2010, 05:38 UTC
- Message-ID
- <1292650725-21149-3-git-send-email-lodatom@gmail.com>
- In-Reply-To
- <1292650725-21149-1-git-send-email-lodatom@gmail.com>
Finish the work of 0adda93 (Use parentheses and `...' where appropriate) to follow the rules set forth in Documentation/CodingGuidelines.
Signed-off-by: Mark Lodato <lodatom@gmail.com> --- Documentation/git-fsck.txt | 2 +- Documentation/git-merge-index.txt | 2 +- Documentation/gitcli.txt | 2 +- builtin/describe.c | 2 +- builtin/merge-index.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt index 86f9b2b..38207a1 100644 --- a/Documentation/git-fsck.txt +++ b/Documentation/git-fsck.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs] - [--[no-]full] [--strict] [--verbose] [--lost-found] [<object>*] + [--[no-]full] [--strict] [--verbose] [--lost-found] [<object>...] DESCRIPTION ----------- diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 921b38f..3716309 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -8,7 +8,7 @@ git-merge-index - Run a merge for files needing merging SYNOPSIS -------- -'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>*) +'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>...) DESCRIPTION ----------- diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt index 6928724..eb65dcf 100644 --- a/Documentation/gitcli.txt +++ b/Documentation/gitcli.txt @@ -81,7 +81,7 @@ couple of magic command line options: + --------------------------------------------- $ git describe -h -usage: git describe [options] <committish>* +usage: git describe [options] <committish>... --contains find the tag that comes after the commit --debug debug search strategy on stderr diff --git a/builtin/describe.c b/builtin/describe.c index a0f52c1..34a8031 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -12,7 +12,7 @@ #define MAX_TAGS (FLAG_BITS - 1) static const char * const describe_usage[] = { - "git describe [options] <committish>*", + "git describe [options] <committish>...", "git describe [options] --dirty", NULL }; diff --git a/builtin/merge-index.c b/builtin/merge-index.c index 2c4cf5e..c683bbd 100644 --- a/builtin/merge-index.c +++ b/builtin/merge-index.c @@ -76,7 +76,7 @@ int cmd_merge_index(int argc, const char **argv, const char *prefix) signal(SIGCHLD, SIG_DFL); if (argc < 3) - usage("git merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)"); + usage("git merge-index [-o] [-q] <merge-program> (-a | [--] <filename>...)"); read_cache();
-- 1.7.3.2