Web lists-archives.com

Re: [PATCH v2 0/2] Reimplement rebase --merge via interactive machinery




On Wed, Nov 7, 2018 at 10:02 PM Elijah Newren <newren@xxxxxxxxx> wrote:
>
> Now that the rewrite-interactive-rebases-in-C series have finally
> merged to master, this series deletes git-rebase--merge.sh and
> reimplements the --merge behavior on top of the interactive machinery.
>
> Differences since v1:
>   - Updated code to hook into builtin/rebase.C instead of git-rebase.sh
>
> (No range-diff provided, because it has been months since v1, and v1
> was only RFC and was only discussed at a high level.)

Actually, that's not correct; it's been so long that I forgot.  Dscho
and Phillip both reviewed it and I updated my series at the time with
their suggestions, but didn't re-submit because it depended on so many
other series and conflicted with the rebase-in-C work.  So other
differences include the changes I made to address their feedback,
but...even if I dug up the old v1 and created a range-diff against it
I'm not so sure it'd be helpful.  If anyone thinks it would be, holler
and I'll generate it.

Original series here:
https://public-inbox.org/git/20180607171344.23331-1-newren@xxxxxxxxx/