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

2018-11-07 Thread Elijah Newren
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

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

2018-11-07 Thread Elijah Newren
On Wed, Nov 7, 2018 at 10:02 PM Elijah Newren 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: > - Updat