Elijah Newren <newren@xxxxxxxxx> writes: >> > [Stalled] >> > >> > * pw/advise-rebase-skip (2019-12-06) 9 commits >> > - rebase -i: leave CHERRY_PICK_HEAD when there are conflicts >> > - rebase: fix advice when a fixup creates an empty commit >> > ... >> The tip "rebase -i: leave CHERRY_PICK_HEAD when there are conflicts" >> needs reworking and can be dropped (cf >> <7e1b92f5-48df-e202-ebcc-5b15987a7d63@xxxxxxxxx>). The other RFC patch >> "rebase: fix advice when a fixup creates an empty commit" [1] could do >> with someone commenting on it (I've Cc'd dscho and Elijah). I think the > > I'll try to take a look early to middle of next week. Thanks, both. I think the early ones except for those two make sense by themselves, so perhaps I'll advance them to 'next' independently of these two steps.
