зеркало из https://github.com/microsoft/git.git
Merge branch 'ac/usage-string-fixups'
Usage-string normalization. * ac/usage-string-fixups: amend remaining usage strings according to style guide
This commit is contained in:
Коммит
6d8d81ec36
|
@ -1270,7 +1270,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
|
|||
OPT_CMDMODE(0, "bisect-visualize", &cmdmode,
|
||||
N_("visualize the bisection"), BISECT_VISUALIZE),
|
||||
OPT_CMDMODE(0, "bisect-run", &cmdmode,
|
||||
N_("use <cmd>... to automatically bisect."), BISECT_RUN),
|
||||
N_("use <cmd>... to automatically bisect"), BISECT_RUN),
|
||||
OPT_BOOL(0, "no-log", &nolog,
|
||||
N_("no log for BISECT_WRITE")),
|
||||
OPT_END()
|
||||
|
|
|
@ -600,7 +600,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
|
|||
OPT_BIT(0, "updateref", &flags,
|
||||
N_("update the reference to the value of the top reflog entry"),
|
||||
EXPIRE_REFLOGS_UPDATE_REF),
|
||||
OPT_BOOL(0, "verbose", &verbose, N_("print extra information on screen.")),
|
||||
OPT_BOOL(0, "verbose", &verbose, N_("print extra information on screen")),
|
||||
OPT_CALLBACK_F(0, "expire", &cmd, N_("timestamp"),
|
||||
N_("prune entries older than the specified time"),
|
||||
PARSE_OPT_NONEG,
|
||||
|
@ -613,7 +613,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
|
|||
N_("prune any reflog entries that point to broken commits")),
|
||||
OPT_BOOL(0, "all", &do_all, N_("process the reflogs of all references")),
|
||||
OPT_BOOL(1, "single-worktree", &all_worktrees,
|
||||
N_("limits processing to reflogs from the current worktree only.")),
|
||||
N_("limits processing to reflogs from the current worktree only")),
|
||||
OPT_END()
|
||||
};
|
||||
|
||||
|
@ -736,7 +736,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
|
|||
OPT_BIT(0, "updateref", &flags,
|
||||
N_("update the reference to the value of the top reflog entry"),
|
||||
EXPIRE_REFLOGS_UPDATE_REF),
|
||||
OPT_BOOL(0, "verbose", &verbose, N_("print extra information on screen.")),
|
||||
OPT_BOOL(0, "verbose", &verbose, N_("print extra information on screen")),
|
||||
OPT_END()
|
||||
};
|
||||
|
||||
|
|
|
@ -1882,7 +1882,7 @@ static int module_clone(int argc, const char **argv, const char *prefix)
|
|||
OPT_STRING(0, "depth", &clone_data.depth,
|
||||
N_("string"),
|
||||
N_("depth for shallow clones")),
|
||||
OPT__QUIET(&quiet, "Suppress output for cloning a submodule"),
|
||||
OPT__QUIET(&quiet, "suppress output for cloning a submodule"),
|
||||
OPT_BOOL(0, "progress", &progress,
|
||||
N_("force cloning progress")),
|
||||
OPT_BOOL(0, "require-init", &require_init,
|
||||
|
|
2
diff.c
2
diff.c
|
@ -5630,7 +5630,7 @@ static void prep_parse_options(struct diff_options *options)
|
|||
N_("select files by diff type"),
|
||||
PARSE_OPT_NONEG, diff_opt_diff_filter),
|
||||
{ OPTION_CALLBACK, 0, "output", options, N_("<file>"),
|
||||
N_("Output to a specific file"),
|
||||
N_("output to a specific file"),
|
||||
PARSE_OPT_NONEG, NULL, 0, diff_opt_output },
|
||||
|
||||
OPT_END()
|
||||
|
|
|
@ -221,9 +221,9 @@ static int quote_stress_test(int argc, const char **argv)
|
|||
struct strbuf out = STRBUF_INIT;
|
||||
struct strvec args = STRVEC_INIT;
|
||||
struct option options[] = {
|
||||
OPT_INTEGER('n', "trials", &trials, "Number of trials"),
|
||||
OPT_INTEGER('s', "skip", &skip, "Skip <n> trials"),
|
||||
OPT_BOOL('m', "msys2", &msys2, "Test quoting for MSYS2's sh"),
|
||||
OPT_INTEGER('n', "trials", &trials, "number of trials"),
|
||||
OPT_INTEGER('s', "skip", &skip, "skip <n> trials"),
|
||||
OPT_BOOL('m', "msys2", &msys2, "test quoting for MSYS2's sh"),
|
||||
OPT_END()
|
||||
};
|
||||
const char * const usage[] = {
|
||||
|
|
Загрузка…
Ссылка в новой задаче