On Tue, Dec 11, 2018 at 8:11 AM Elijah Newren <newren@xxxxxxxxx> wrote: > > This series continues the work of making rebase more self-consistent > by removing inconsistencies between different backends. In > particular, this series focuses on making the merge machinery behave > like the interactive machinery (though a few differences between the am > and interactive backends are also fixed along the way), and ultimately > removes the merge backend in favor of reimplementing the relevant > options on top of the interactive machinery. Friendly ping...let me know if you want me to simply resend v4. > Differences since v3 (full range-diff below): > - Fixed the redundant "fatal: error:" error message prefixes, as pointed > out by Duy > - Rebased on 2.20.0 > > Elijah Newren (8): > rebase: make builtin and legacy script error messages the same > rebase: fix incompatible options error message > t5407: add a test demonstrating how interactive handles --skip > differently > am, rebase--merge: do not overlook --skip'ed commits with post-rewrite > git-rebase, sequencer: extend --quiet option for the interactive > machinery > git-legacy-rebase: simplify unnecessary triply-nested if > rebase: define linearization ordering and enforce it > rebase: Implement --merge via the interactive machinery > ...
