Hi Junio, On Tue, 17 Apr 2018, Junio C Hamano wrote:
> * js/rebase-recreate-merge (2018-04-11) 15 commits > - rebase -i --rebase-merges: add a section to the man page > - rebase -i: introduce --rebase-merges=[no-]rebase-cousins > - pull: accept --rebase=merges to recreate the branch topology > - rebase --rebase-merges: avoid "empty merges" > - sequencer: handle post-rewrite for merge commands > - sequencer: make refs generated by the `label` command worktree-local > - rebase --rebase-merges: add test for --keep-empty > - rebase: introduce the --rebase-merges option > - rebase-helper --make-script: introduce a flag to rebase merges > - sequencer: fast-forward `merge` commands, if possible > - sequencer: introduce the `merge` command > - sequencer: introduce new commands to reset the revision > - git-rebase--interactive: clarify arguments > - sequencer: make rearrange_squash() a bit more obvious > - sequencer: avoid using errno clobbered by rollback_lock_file() > > "git rebase" learned "--rebase-merges" to transplant the whole > topology of commit graph elsewhere. > > This looked more or less ready for 'next'. Please stop me if there > are remaining issues I forgot about. Phillip pointed out some ugliness in the way I reschedule commands after they failed fatally, and I will fix that, I will also fix the erroneous commit message starting with "# This is a combination of ...", and then I wanted to go over the added documentation one last time (with a fresh set of eyes, after looking at so much other code). So: please do not yet merge this to `next`. I think I need one more iteration. Ciao, Dscho
