On Wed, Aug 4, 2021 at 9:50 AM Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> Hi Elijah,
>
> On 04/08/2021 06:28, Elijah Newren via GitGitGadget wrote:
> > From: Elijah Newren <newren@xxxxxxxxx>
> >
> > Commit 58634dbff8 ("rebase: Allow merge strategies to be used when
> > rebasing", 2006-06-21) added the --merge option to git-rebase so that
> > renames could be detected (at least when using the `recursive` merge
> > backend). However, git-am -3 gained that same ability in commit
> > 579c9bb198 ("Use merge-recursive in git-am -3.", 2006-12-28). As such,
> > the comment about being able to detect renames is not particularly
> > noteworthy. Remove it. While tweaking this description, add a quick
> > comment about when --merge became the default.
>
> The last sentence of the commit message does not seem to apply to
> this patch (any more ...?).
Doh! Yes, you're right, that last sentence should be removed.
> [Awesome work on 'merge -sort', by the way!]
Thanks!
> ATB,
> Ramsay Jones
