Re: [PATCH] git-rebase.txt: update to reflect merge now implemented on sequencer

2019-02-18 Thread Johannes Schindelin
Hi Elijah, On Thu, 14 Feb 2019, Elijah Newren wrote: > Since commit 8fe9c3f21dff (Merge branch 'en/rebase-merge-on-sequencer', > 2019-02-06), --merge now uses the interactive backend (and matches its > behavior) so there is no separate merge backend anymore. Fix an > oversight in the docs that s

[PATCH] git-rebase.txt: update to reflect merge now implemented on sequencer

2019-02-14 Thread Elijah Newren
Since commit 8fe9c3f21dff (Merge branch 'en/rebase-merge-on-sequencer', 2019-02-06), --merge now uses the interactive backend (and matches its behavior) so there is no separate merge backend anymore. Fix an oversight in the docs that should have been updated with the previous change. Signed-off-b