[PATCH v4 09/10] diff: --pickaxe-{all,regex} help: Add --patch-{grep,modifies}
For less experienced users --patch-{grep,modifies} should be easier to
understand than just -S or -G. By mentioning the long argument names in
the help messages we save those users from having to search the list of
options for an explanation of what -S or -G stand for.
---
diff.c | 4 ++--
diff.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)diff --git a/diff.c b/diff.c
index ac2cd..a9e78 100644
--- a/diff.c
+++ b/diff.c
@@ -5871,10 +5871,10 @@ struct option *add_diff_options(const struct option *opts,
N_("look for differences where a patch contains the specified regex"),
0, diff_opt_pickaxe_regex),
OPT_BIT_F(0, "pickaxe-all", &options->pickaxe_opts,
- N_("show all changes in the changeset with -S or -G"),
+ N_("show all changes in the changeset with -S/--patch-modifies or -G/--patch-grep"),
DIFF_PICKAXE_ALL, PARSE_OPT_NONEG),
OPT_BIT_F(0, "pickaxe-regex", &options->pickaxe_opts,
- N_("treat <string> in -S as extended POSIX regular expression"),
+ N_("treat <string> in -S/--patch-modifies as extended POSIX regular expression"),
DIFF_PICKAXE_REGEX, PARSE_OPT_NONEG),
OPT_FILENAME('O', NULL, &options->orderfile,
N_("control the order in which files appear in the output")),
diff --git a/diff.h b/diff.h
index ed48a..9ad37 100644
--- a/diff.h
+++ b/diff.h
@@ -613,9 +613,9 @@ void diffcore_fix_diff_index(void);
" --patch-modifies=<string>\n" \
" find filepair who differ in the number of occurrences of string.\n" \
" --pickaxe-grep\n" \
-" treat <string> as a regex in the -S argument.\n" \
+" treat <string> as a regex in the -S/--patch-modifies argument.\n" \
" --pickaxe-all\n" \
-" show all files diff when -G or -S is used and hit is found.\n" \
+" show all files diff for -G/--patch-grep and -S/--patch-modifies.\n" \
" -a --text treat all files as text.\n"
int diff_queue_is_empty(struct diff_options *o);
--
2.45.2
Illia Bobyr <illia.bobyr@gmail.com>