Re: Determining if a merge was produced automatically

From: Pavel Rappo <pavel.rappo@gmail.com>
Date: Jul 1, 2024, 13:13 UTC
Message-ID: <CAChcVunPFBPmZ-NxBTAD56Gf_WcSXDHkFM_CzhbkULzDDo2NSA@mail.gmail.com>
In-Reply-To: <ZoKXt0jPphoM5nmJ@google.com>

I think the documentation is quite clear. It's just that it makes that feature unhelpful for my use case, as output from the following command is subject to change:

    git show --remerge-diff --pretty=format:%b <merge-commit>

Now, if that's untrue, and the output from the above command cannot change, then yes, the documentation should be improved.

-Pavel

On Mon, Jul 1, 2024 at 12:49 PM Jonathan Nieder <jrnieder@gmail.com> wrote:

Show 23 quoted lines

>
> Hi Pavel,
>
> Pavel Rappo wrote:
>
> > However, this bit means that I shouldn't entirely trust its output:
> >
> >> The output emitted when this option is used is subject to change, and so is its interaction with other options (unless explicitly documented).
> >
> > What is my best course of action?
>
> I'd encourage proposing a patch to make the documentation say what you
> wish it said.  What guarantees would you like it to make?  That will
> help with others in the project being able to decide what it should
> guarantee and what it shouldn't, and regardless of the outcome of
> discussion it would make the documentation more helpful for the next
> person.
>
> See Documentation/MyFirstContribution for some more details on how
> proposing a patch works.
>
> Thanks and hope that helps,
> Jonathan