diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2022-09-23 16:50:32 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2022-09-23 16:50:32 +0800 |
| commit | eb0d7810948e6fd6debf62e842fbaaa6da512bde (patch) | |
| tree | c50ca0ac4e4ca80a78e89331a11afe1e527533c0 /builtin | |
| parent | Merge branch 'po-id' of github.com:bagasme/git-po (diff) | |
| parent | Merge branch 'jk/list-objects-filter-cleanup' (diff) | |
| download | git-eb0d7810948e6fd6debf62e842fbaaa6da512bde.tar.gz git-eb0d7810948e6fd6debf62e842fbaaa6da512bde.zip | |
Merge branch 'main' of github.com:git/git
* 'main' of github.com:git/git:
list-objects-filter: initialize sub-filter structs
Git 2.38-rc1
Final batch before -rc1
builtin/diagnose.c: don't translate the two mode values
t/Makefile: remove 'test-results' on 'make clean'
gc: don't translate literal commands
Documentation: clean up various typos in technical docs
Documentation: clean up a few misspelled word typos
version: fix builtin linking & documentation
diagnose: add to command-list.txt
Documentation: add ReviewingGuidelines
commit-graph: Fix missing closedir in expire_commit_graphs
diagnose.c: refactor to safely use 'd_type'
help: fix doubled words in explanation for developer interfaces
api docs: link to html version of api-trace2
docs: fix a few recently broken links
reftable: use a pointer for pq_entry param
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/diagnose.c | 2 | ||||
| -rw-r--r-- | builtin/gc.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/builtin/diagnose.c b/builtin/diagnose.c index cd260c2015..576e0e8e38 100644 --- a/builtin/diagnose.c +++ b/builtin/diagnose.c @@ -22,7 +22,7 @@ int cmd_diagnose(int argc, const char **argv, const char *prefix) N_("specify a destination for the diagnostics archive")), OPT_STRING('s', "suffix", &option_suffix, N_("format"), N_("specify a strftime format suffix for the filename")), - OPT_CALLBACK_F(0, "mode", &mode, N_("(stats|all)"), + OPT_CALLBACK_F(0, "mode", &mode, "(stats|all)", N_("specify the content of the diagnostic archive"), PARSE_OPT_NONEG, option_parse_diagnose), OPT_END() diff --git a/builtin/gc.c b/builtin/gc.c index 0accc02406..2753bd15a5 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -1461,7 +1461,7 @@ static char *get_maintpath(void) } static char const * const builtin_maintenance_register_usage[] = { - N_("git maintenance register"), + "git maintenance register", NULL }; @@ -1519,7 +1519,7 @@ done: } static char const * const builtin_maintenance_unregister_usage[] = { - N_("git maintenance unregister"), + "git maintenance unregister", NULL }; @@ -2542,7 +2542,7 @@ static int maintenance_start(int argc, const char **argv, const char *prefix) } static const char *const builtin_maintenance_stop_usage[] = { - N_("git maintenance stop"), + "git maintenance stop", NULL }; |