diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2024-02-16 09:39:06 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2024-02-16 09:39:06 +0800 |
| commit | c68ee9b9cc322b3f2fe5921150def5c7f511e1ff (patch) | |
| tree | 57fa78609d77167fdf32a7d7db82659a8861fe4a | |
| parent | f98643fcb247a3613291d70f6f8e6f80b359c56b (diff) | |
| parent | 3e0d3cd5c7def4808247caf168e17f2bbf47892b (diff) | |
| download | git-c68ee9b9cc322b3f2fe5921150def5c7f511e1ff.tar.gz | |
Merge branch 'master' of github.com:git/git
* 'master' of github.com:git/git:
diff: mark param1 and param2 as placeholders
| -rw-r--r-- | diff.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -5590,7 +5590,7 @@ struct option *add_diff_options(const struct option *opts, OPT_BITOP(0, "shortstat", &options->output_format, N_("output only the last line of --stat"), DIFF_FORMAT_SHORTSTAT, DIFF_FORMAT_NO_OUTPUT), - OPT_CALLBACK_F('X', "dirstat", options, N_("<param1,param2>..."), + OPT_CALLBACK_F('X', "dirstat", options, N_("<param1>,<param2>..."), N_("output the distribution of relative amount of changes for each sub-directory"), PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_dirstat), @@ -5598,8 +5598,8 @@ struct option *add_diff_options(const struct option *opts, N_("synonym for --dirstat=cumulative"), PARSE_OPT_NONEG | PARSE_OPT_NOARG, diff_opt_dirstat), - OPT_CALLBACK_F(0, "dirstat-by-file", options, N_("<param1,param2>..."), - N_("synonym for --dirstat=files,param1,param2..."), + OPT_CALLBACK_F(0, "dirstat-by-file", options, N_("<param1>,<param2>..."), + N_("synonym for --dirstat=files,<param1>,<param2>..."), PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_dirstat), OPT_BIT_F(0, "check", &options->output_format, |