Re: [PATCH 00/10] Documentation updates: merge-strategies

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Aug 3, 2021, 23:06 UTC
Message-ID: <nycvar.QRO.7.76.6.2108040105330.55@tvgsbejvaqbjf.bet>
In-Reply-To: <pull.1059.git.git.1628004920.gitgitgadget@gmail.com>

Hi Elijah,

On Tue, 3 Aug 2021, Elijah Newren via GitGitGadget wrote:

Show 8 quoted lines

> I noticed while updating my switch-default-merge-strategy-to-ort submission,
> that many of the changes were good documentation updates that we might want
> for Git v2.33.0. So I pulled those changes out and split them into lots of
> little commits so that if any parts need discussion or are objectionable, we
> can just drop those from this series and apply the rest for v2.33.0.
>
> The first 9 commits are just small documentation updates, but there is one
> commit at the end that updates an error message and a code comment.

I looked through them, and they all looked sensible. Hopefully my few suggestions/questions are helpful.

Thank you for working on this, Dscho