Re: [PATCH v2] rev-list-options.txt: start a list for `show-pulls`

From: Martin Ågren <martin.agren@gmail.com>
Date: May 26, 2020, 19:18 UTC
Message-ID: <CAN0heSq3mv8OcFiESVhN_fZ=iChSAUQ_Js0g=bTsY5dMepkk9A@mail.gmail.com>
In-Reply-To: <4a3797f8-5169-b016-b1c4-ce544f00b34b@gmail.com>

Hi Stolee,

On Tue, 26 May 2020 at 14:24, Derrick Stolee <stolee@gmail.com> wrote:

Show 17 quoted lines

>
> On 5/25/2020 1:06 PM, Martin Ågren wrote:
> > On Mon, 18 May 2020 at 22:22, Junio C Hamano <gitster@pobox.com> wrote:
> > @@ -671,10 +671,13 @@ important branch. Instead, the merge `N` was used to merge `R` and `X`
> >  into the important branch. This commit may have information about why
> >  the change `X` came to override the changes from `A` and `B` in its
> >  commit message.
> > +
> > +--show-pulls::
> > +     In addition to the commits shown in the default history, show
> > +     each merge commit that is not TREESAME to its first parent but
> > +     is TREESAME to a later parent.
> >  +
> > -The `--show-pulls` option helps with both of these issues by adding more
>
> I like how you found a way to add the list item without needing to make a
> huge shift in the surrounding prose. LGTM.

Actually, I didn't see how to do it, but luckily, you did. [1] So I take this to mean that even on re-reading your proposed text some time later, you like it. ;-)

Martin

[1] https://lore.kernel.org/git/34870e5f-8e61-4af8-1050-43bfbe30d8f9@gmail.com/