Re: [PATCH v2 08/10] git-rebase.txt: correct out-of-date and misleading text about renames

From: Elijah Newren <newren@gmail.com>
Date: Aug 4, 2021, 17:18 UTC
Message-ID: <CABPp-BHgnSu+9ZxEQMDR1x+2Z0zCX2ysqxoH0t=W+a8yrL1L_w@mail.gmail.com>
In-Reply-To: <eff818fc-9f4d-35db-a4df-8b05408d7d6c@ramsayjones.plus.com>

On Wed, Aug 4, 2021 at 9:50 AM Ramsay Jones <ramsay@ramsayjones.plus.com> wrote:

Show 17 quoted lines

>
> Hi Elijah,
>
> On 04/08/2021 06:28, Elijah Newren via GitGitGadget wrote:
> > From: Elijah Newren <newren@gmail.com>
> >
> > 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