tree f33b9ec70cc3d7e7a068d7ef24a6895d69accf00
parent 8feddda32cc50e928404788d7b9377c0b5f73f50
parent 68aa495b590d417e88562ab1e5da7d84d0531f21
author Junio C Hamano <gitster@pobox.com> 1549519520 -0800
committer Junio C Hamano <gitster@pobox.com> 1549519520 -0800

Merge branch 'en/rebase-merge-on-sequencer'

"git rebase --merge" as been reimplemented by reusing the internal
machinery used for "git rebase -i".

* en/rebase-merge-on-sequencer:
  rebase: implement --merge via the interactive machinery
  rebase: define linearization ordering and enforce it
  git-legacy-rebase: simplify unnecessary triply-nested if
  git-rebase, sequencer: extend --quiet option for the interactive machinery
  am, rebase--merge: do not overlook --skip'ed commits with post-rewrite
  t5407: add a test demonstrating how interactive handles --skip differently
  rebase: fix incompatible options error message
  rebase: make builtin and legacy script error messages the same