From: Illia Bobyr <illia.bobyr@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Illia Bobyr <illia.bobyr@gmail.com>, git@vger.kernel.org
Subject: [PATCH v5 09/10] diff: --pickaxe-{all,regex} help: Add --patch-{grep,modifies}
Date: Tue, 11 Feb 2025 19:26:53 -0800 [thread overview]
Message-ID: <20250212032657.1807939-10-illia.bobyr@gmail.com> (raw)
In-Reply-To: <20250212032657.1807939-1-illia.bobyr@gmail.com>
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
next prev parent reply other threads:[~2025-02-12 3:27 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-06 1:43 [PATCH v3 0/1] Long names for `git log -S` and `git log -G` Illia Bobyr
2025-02-06 1:43 ` [PATCH v3 1/1] diff: --patch-{modifies,grep} arg names for -S and -G Illia Bobyr
2025-02-06 20:59 ` Junio C Hamano
2025-02-12 3:26 ` Illia Bobyr
2025-02-12 17:08 ` Junio C Hamano
2025-02-06 13:04 ` [PATCH v3 0/1] Long names for `git log -S` and `git log -G` Junio C Hamano
2025-02-11 8:50 ` [PATCH v4 0/10] " Illia Bobyr
2025-02-11 18:07 ` Junio C Hamano
2025-02-12 3:28 ` Illia Bobyr
2025-02-11 8:50 ` [PATCH v4 01/10] t/t4209-log-pickaxe: Naming typo: -G takes a regex Illia Bobyr
2025-02-11 8:50 ` [PATCH v4 02/10] diff: -G description: Correct copy/paste error Illia Bobyr
2025-02-11 8:50 ` [PATCH v4 03/10] diff: short help: Correct -S description Illia Bobyr
2025-02-11 8:50 ` [PATCH v4 04/10] diff: short help: Add -G and --pickaxe-grep Illia Bobyr
2025-02-11 8:50 ` [PATCH v4 05/10] docs: gitdiffcore: -G and -S: Use regex/string placeholders Illia Bobyr
2025-02-11 8:50 ` [PATCH v4 06/10] diff: --patch-{grep,modifies} arg names for -G and -S Illia Bobyr
2025-02-11 8:50 ` [PATCH v4 07/10] completion: Support --patch-{grep,modifies} Illia Bobyr
2025-02-11 8:50 ` [PATCH v4 08/10] diff: test: Use --patch-{grep,modifies} over -G/-S Illia Bobyr
2025-02-11 8:50 ` [PATCH v4 09/10] diff: --pickaxe-{all,regex} help: Add --patch-{grep,modifies} Illia Bobyr
2025-02-11 8:50 ` [PATCH v4 10/10] diff: docs: Use --patch-{grep,modifies} over -G/-S Illia Bobyr
2025-02-12 3:26 ` [PATCH v5 00/10] Long names for `git log -S` and `git log -G` Illia Bobyr
2025-02-12 3:26 ` [PATCH v5 01/10] t/t4209-log-pickaxe: Naming typo: -G takes a regex Illia Bobyr
2025-02-13 4:06 ` Junio C Hamano
2025-02-12 3:26 ` [PATCH v5 02/10] diff: -G description: Correct copy/paste error Illia Bobyr
2025-02-13 4:16 ` Junio C Hamano
2025-02-12 3:26 ` [PATCH v5 03/10] diff: short help: Correct -S description Illia Bobyr
2025-02-13 4:26 ` Junio C Hamano
2025-02-12 3:26 ` [PATCH v5 04/10] diff: short help: Add -G and --pickaxe-grep Illia Bobyr
2025-02-12 3:26 ` [PATCH v5 05/10] docs: gitdiffcore: -G and -S: Use regex/string placeholders Illia Bobyr
2025-02-13 4:36 ` Junio C Hamano
2025-02-12 3:26 ` [PATCH v5 06/10] diff: --patch-{grep,modifies} arg names for -G and -S Illia Bobyr
2025-02-13 5:20 ` Junio C Hamano
2025-02-12 3:26 ` [PATCH v5 07/10] completion: Support --patch-{grep,modifies} Illia Bobyr
2025-02-13 5:46 ` Junio C Hamano
2025-02-12 3:26 ` [PATCH v5 08/10] diff: test: Use --patch-{grep,modifies} over -G/-S Illia Bobyr
2025-02-12 3:26 ` Illia Bobyr [this message]
2025-02-12 3:26 ` [PATCH v5 10/10] diff: docs: " Illia Bobyr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250212032657.1807939-10-illia.bobyr@gmail.com \
--to=illia.bobyr@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).