diff options
| author | Tay Ray Chuan <rctay89@gmail.com> | 2010-04-10 06:50:19 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-10 08:23:10 +0400 |
| commit | e3163c75156f1b85e8a778cecfacae63c14dcdbb (patch) | |
| tree | b32ba1c95636e28f2e14a515d5adfab270a90278 | |
| parent | 4c35f0dbc41a2bb79e4f597d3b7bdb265c5ea750 (diff) | |
fetch/push: fix usage strings
- use "<options>" instead of just "options".
- use "[<repository> [<refspec>...]]" to indicate that <repository> and
<refspec> are optional, and that <refspec> cannot be specified
without specifying <repository>.
Note that when called without specifying <repository> (eg. "git fetch
-f"), it is accurate to say that the "git fetch [<options>]
[<repository> ...]" case takes precedence over "git fetch [<options>]
<group>".
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-fetch.txt | 8 | ||||
| -rw-r--r-- | Documentation/git-push.txt | 2 | ||||
| -rw-r--r-- | builtin-fetch.c | 8 | ||||
| -rw-r--r-- | builtin-push.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index 948ea26c5a..400fe7f956 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -8,13 +8,13 @@ git-fetch - Download objects and refs from another repository SYNOPSIS -------- -'git fetch' <options> <repository> <refspec>... +'git fetch' [<options>] [<repository> [<refspec>...]] -'git fetch' <options> <group> +'git fetch' [<options>] <group> -'git fetch' --multiple <options> [<repository> | <group>]... +'git fetch' --multiple [<options>] [<repository> | <group>]... -'git fetch' --all <options> +'git fetch' --all [<options>] DESCRIPTION diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 49b6bd9d92..7a4e507c4b 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -11,7 +11,7 @@ SYNOPSIS [verse] 'git push' [--all | --mirror | --tags] [-n | --dry-run] [--receive-pack=<git-receive-pack>] [--repo=<repository>] [-f | --force] [-v | --verbose] [-u | --set-upstream] - [<repository> <refspec>...] + [<repository> [<refspec>...]] DESCRIPTION ----------- diff --git a/builtin-fetch.c b/builtin-fetch.c index bbc425b655..007dabf62f 100644 --- a/builtin-fetch.c +++ b/builtin-fetch.c @@ -13,10 +13,10 @@ #include "sigchain.h" static const char * const builtin_fetch_usage[] = { - "git fetch [options] [<repository> <refspec>...]", - "git fetch [options] <group>", - "git fetch --multiple [options] [<repository> | <group>]...", - "git fetch --all [options]", + "git fetch [<options>] [<repository> [<refspec>...]]", + "git fetch [<options>] <group>", + "git fetch --multiple [<options>] [<repository> | <group>]...", + "git fetch --all [<options>]", NULL }; diff --git a/builtin-push.c b/builtin-push.c index f7bc2b292f..9fc6931247 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -10,7 +10,7 @@ #include "parse-options.h" static const char * const push_usage[] = { - "git push [<options>] [<repository> <refspec>...]", + "git push [<options>] [<repository> [<refspec>...]]", NULL, }; |