Rebased v4 [1] on top of `master`. I've accidentally published v4 based on `next`. [1] https://lore.kernel.org/git/20250211085028.3923875-1-illia.bobyr@xxxxxxxxx/ Other than the rebase, it is identical to v4, details below. Split the big change from v3 [1] into multiple, mostly independent patches, to make it easier to review and merge each one separately. Patches 1 through 4 are fixing minor bugs and inconsistencies. Patch 5 contains updates gitdiffcore to use same placeholder names as the rest of the code. Patch 6 contains a minimum change to add long versions of -S and -G. Patch 7 adds bash completion support. Patches 8 through 10 increase usage of the long argument versions in tests, CLI help and docs respectively. Please, let me know if you prefer it split in a different way, or reorder the changes. Illia Bobyr (10): t/t4209-log-pickaxe: Naming typo: -G takes a regex diff: -G description: Correct copy/paste error diff: short help: Correct -S description diff: short help: Add -G and --pickaxe-grep docs: gitdiffcore: -G and -S: Use regex/string placeholders diff: --patch-{grep,modifies} arg names for -G and -S completion: Support --patch-{grep,modifies} diff: test: Use --patch-{grep,modifies} over -G/-S diff: --pickaxe-{all,regex} help: Add --patch-{grep,modifies} diff: docs: Use --patch-{grep,modifies} over -G/-S Documentation/diff-options.txt | 36 +++++---- Documentation/git-blame.txt | 2 +- Documentation/gitdiffcore.txt | 55 ++++++------- contrib/completion/git-completion.bash | 11 ++- diff.c | 18 +++-- diff.h | 11 ++- t/t4062-diff-pickaxe.sh | 8 +- t/t4209-log-pickaxe.sh | 106 +++++++++++++++++-------- 8 files changed, 155 insertions(+), 92 deletions(-) -- 2.45.2
