Re: [PATCH v4 12/12] builtin/rerere: introduce proper usage strings for subcommands
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 17, 2026, 01:37 UTC
- Message-ID
- <xmqqo6bogrvc.fsf@gitster.g>
- In-Reply-To
- <20261111-pks-rerere-subcommands-v4-12-df0c8bf79e16@pks.im>
Patrick Steinhardt <ps@pks.im> writes:
Show 19 quoted lines
> 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 <pathspec>... | diff | status | remaining | gc] > +'git rerere' [--[no-]rerere-autoupdate] > +'git rerere' clear > +'git rerere' diff > +'git rerere' forget <pathspec>... > +'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.