From: Patrick Steinhardt Date: Wed, 18 Nov 2026 14:09:26 GMT Subject: Re: [PATCH v4 12/12] builtin/rerere: introduce proper usage strings for subcommands Message-ID: In-Reply-To: On Mon, Nov 16, 2026 at 05:37:43PM -0800, Junio C Hamano wrote: > Patrick Steinhardt writes: > > > diff --git a/Documentation/git-rerere.adoc b/Documentation/git-rerere.adoc > > index 4e6ab9a27c9..e04e9ef3ef8 100644 > > --- a/Documentation/git-rerere.adoc > > +++ b/Documentation/git-rerere.adoc > > @@ -8,7 +8,13 @@ git-rerere - Reuse recorded resolution of conflicted merges > > SYNOPSIS > > -------- > > [verse] > > -'git rerere' [clear | forget ... | diff | status | remaining | gc] > > +'git rerere' [--[no-]rerere-autoupdate] > > +'git rerere' clear > > +'git rerere' diff > > +'git rerere' forget ... > > +'git rerere' gc > > +'git rerere' remaining > > +'git rerere' status > > > > DESCRIPTION > > ----------- > > The above is consistent with [9/12] where we saw that the command > barfs if you say 'git rerere diff blurb'. > > Yet, the documentation contradicts with the behaviour. > > 'diff':: > > Display diffs for the current state of the resolution. It is > useful for tracking what has changed while the user is resolving > conflicts. Additional arguments are passed directly to the system > 'diff' command installed in PATH. > > We do not take additional arguments. We do not pass anything to the > system `diff` command installed in PATH. It was a behaviour change > left undocumented ever since 658f365027 (Make git-rerere a builtin, > 2006-12-20) was done. Huh, interesting indeed. I'll include another patch to fix that while we're here already. Patrick