From: Patrick Steinhardt Date: Tue, 27 Oct 2026 10:46:43 GMT Subject: [PATCH 00/12] builtin/rerere: convert to use subcommands Message-ID: <20261027-pks-rerere-subcommands-v1-0-d836c36ce0c5@pks.im> Hi, while reviewing some patch series around git-rerere(1) recently I was a bit appalled by our custom subcommand parsing that we do here. This patch series here thus cleans up and modernizes that part a bit so that git-rerere(1) behaves like every other Git command that happens to have subcommands. This series is based on 37b3475fb53 (The 9th batch, 2026-10-25) with ps/rerere-remove-global-state at b948c10c8b3 (rerere: get rid of global rerere cache state, 2026-10-23) merged into it. Thanks! Patrick --- Patrick Steinhardt (12): rerere: rename `repo_rerere()` rerere: convert flags into an enum builtin/rerere: drop `the_repository` builtin/rerere: stop passing flags to subcommands that ignore them builtin/rerere: turn "forget" into a proper subcommand builtin/rerere: turn "clear" into a proper subcommand builtin/rerere: turn "status" into a proper subcommand builtin/rerere: turn "remaining" into a proper subcommand builtin/rerere: turn "diff" into a proper subcommand builtin/rerere: turn "gc" into a proper subcommand builtin/rerere: use `OPT_SUBCOMMAND()` builtin/rerere: introduce proper usage strings for subcommands Documentation/git-rerere.adoc | 8 +- apply.c | 2 +- builtin/am.c | 4 +- builtin/commit.c | 2 +- builtin/merge.c | 2 +- builtin/rerere.c | 319 ++++++++++++++++++++++++++++++++---------- builtin/stash.c | 2 +- rerere.c | 7 +- rerere.h | 21 +-- sequencer.c | 4 +- t/t4200-rerere.sh | 5 - 11 files changed, 275 insertions(+), 101 deletions(-) --- base-commit: 710910c03a22ac663885049213b9fef5853ea8e0 change-id: 20261027-pks-rerere-subcommands-318d41553438