diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-10-13 17:39:10 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-10-13 18:32:56 +0200 |
commit | f6a8ef07009bf44e2fed292439161c241e09b40d (patch) | |
tree | bd70b9109a364f7b3d7910441376fd064a502140 /builtin | |
parent | doc SYNOPSIS & -h: use "-" to separate words in labels, not "_" (diff) | |
download | git-f6a8ef07009bf44e2fed292439161c241e09b40d.tar.xz git-f6a8ef07009bf44e2fed292439161c241e09b40d.zip |
doc txt & -h consistency: fix mismatching labels
Fix various inconsistencies between command SYNOPSIS and the
corresponding -h output where our translatable labels didn't match
up.
In some cases we need to adjust the prose that follows the SYNOPSIS
accordingly, as it refers back to the changed label.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/bugreport.c | 2 | ||||
-rw-r--r-- | builtin/clean.c | 2 | ||||
-rw-r--r-- | builtin/commit-graph.c | 4 | ||||
-rw-r--r-- | builtin/for-each-repo.c | 2 | ||||
-rw-r--r-- | builtin/pack-redundant.c | 2 | ||||
-rw-r--r-- | builtin/rerere.c | 2 | ||||
-rw-r--r-- | builtin/rev-list.c | 2 | ||||
-rw-r--r-- | builtin/stash.c | 2 | ||||
-rw-r--r-- | builtin/unpack-file.c | 2 | ||||
-rw-r--r-- | builtin/upload-archive.c | 2 | ||||
-rw-r--r-- | builtin/verify-pack.c | 2 | ||||
-rw-r--r-- | builtin/worktree.c | 2 |
12 files changed, 13 insertions, 13 deletions
diff --git a/builtin/bugreport.c b/builtin/bugreport.c index 61d93383f5..96052541cb 100644 --- a/builtin/bugreport.c +++ b/builtin/bugreport.c @@ -60,7 +60,7 @@ static void get_populated_hooks(struct strbuf *hook_info, int nongit) } static const char * const bugreport_usage[] = { - N_("git bugreport [(-o | --output-directory) <file>] [(-s | --suffix) <format>]\n" + N_("git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" " [--diagnose[=<mode>]]"), NULL }; diff --git a/builtin/clean.c b/builtin/clean.c index 5466636e66..6f039f555b 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -26,7 +26,7 @@ static struct string_list del_list = STRING_LIST_INIT_DUP; static unsigned int colopts; static const char *const builtin_clean_usage[] = { - N_("git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."), + N_("git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <pathspec>..."), NULL }; diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index c21cfd5669..0a68935d9e 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -10,10 +10,10 @@ #include "tag.h" #define BUILTIN_COMMIT_GRAPH_VERIFY_USAGE \ - N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]") + N_("git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]") #define BUILTIN_COMMIT_GRAPH_WRITE_USAGE \ - N_("git commit-graph write [--object-dir <objdir>] [--append]\n" \ + N_("git commit-graph write [--object-dir <dir>] [--append]\n" \ " [--split[=<strategy>]] [--reachable | --stdin-packs | --stdin-commits]\n" \ " [--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress]\n" \ " <split options>") diff --git a/builtin/for-each-repo.c b/builtin/for-each-repo.c index fd86e5a861..c6379b783c 100644 --- a/builtin/for-each-repo.c +++ b/builtin/for-each-repo.c @@ -6,7 +6,7 @@ #include "string-list.h" static const char * const for_each_repo_usage[] = { - N_("git for-each-repo --config=<config> <command-args>"), + N_("git for-each-repo --config=<config> <arguments>"), NULL }; diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c index ed9b9013a5..ecd49ca268 100644 --- a/builtin/pack-redundant.c +++ b/builtin/pack-redundant.c @@ -14,7 +14,7 @@ #define BLKSIZE 512 static const char pack_redundant_usage[] = -"git pack-redundant [--verbose] [--alt-odb] (--all | <filename.pack>...)"; +"git pack-redundant [--verbose] [--alt-odb] (--all | <pack-filename>...)"; static int load_all_packs, verbose, alt_odb; diff --git a/builtin/rerere.c b/builtin/rerere.c index 83d7a778e3..12570537d3 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -10,7 +10,7 @@ #include "pathspec.h" static const char * const rerere_usage[] = { - N_("git rerere [clear | forget <path>... | status | remaining | diff | gc]"), + N_("git rerere [clear | forget <pathspec>... | status | remaining | diff | gc]"), NULL, }; diff --git a/builtin/rev-list.c b/builtin/rev-list.c index f67e2b3355..ada68a4af5 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -20,7 +20,7 @@ #include "packfile.h" static const char rev_list_usage[] = -"git rev-list [<options>] <commit-id>... [-- <path>...]\n" +"git rev-list [<options>] <commit>... [-- <path>...]\n" "\n" " limiting output:\n" " --max-count=<n>\n" diff --git a/builtin/stash.c b/builtin/stash.c index 7d82ead676..614bb0dd4a 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -22,7 +22,7 @@ #define INCLUDE_ALL_FILES 2 static const char * const git_stash_usage[] = { - N_("git stash list [<options>]"), + N_("git stash list [<log-options>]"), N_("git stash show [<options>] [<stash>]"), N_("git stash drop [-q | --quiet] [<stash>]"), N_("git stash (pop | apply) [--index] [-q | --quiet] [<stash>]"), diff --git a/builtin/unpack-file.c b/builtin/unpack-file.c index 58652229f2..9e8119dd35 100644 --- a/builtin/unpack-file.c +++ b/builtin/unpack-file.c @@ -27,7 +27,7 @@ int cmd_unpack_file(int argc, const char **argv, const char *prefix) struct object_id oid; if (argc != 2 || !strcmp(argv[1], "-h")) - usage("git unpack-file <sha1>"); + usage("git unpack-file <blob>"); if (get_oid(argv[1], &oid)) die("Not a valid object name %s", argv[1]); diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c index 98d028dae6..945ee2b412 100644 --- a/builtin/upload-archive.c +++ b/builtin/upload-archive.c @@ -10,7 +10,7 @@ #include "strvec.h" static const char upload_archive_usage[] = - "git upload-archive <repo>"; + "git upload-archive <repository>"; static const char deadchild[] = "git upload-archive: archiver died with error"; diff --git a/builtin/verify-pack.c b/builtin/verify-pack.c index 05c5213594..db9ac5c460 100644 --- a/builtin/verify-pack.c +++ b/builtin/verify-pack.c @@ -56,7 +56,7 @@ static int verify_one_pack(const char *path, unsigned int flags, const char *has } static const char * const verify_pack_usage[] = { - N_("git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."), + N_("git verify-pack [-v | --verbose] [-s | --stat-only] <pack>.idx..."), NULL }; diff --git a/builtin/worktree.c b/builtin/worktree.c index c6710b2552..5bfc18e5a2 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -23,7 +23,7 @@ static const char * const worktree_usage[] = { N_("git worktree prune [<options>]"), N_("git worktree remove [<options>] <worktree>"), N_("git worktree repair [<path>...]"), - N_("git worktree unlock <path>"), + N_("git worktree unlock <worktree>"), NULL }; |