On 5/25/2020 1:06 PM, Martin Ågren wrote: > On Mon, 18 May 2020 at 22:22, Junio C Hamano <gitster@xxxxxxxxx> 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. Thanks, -Stolee
