Re: [PATCH 0/2] rebase --recreate-merges --keep-empty: don't prune empty

Phillip Wood writes: > On 20/03/18 19:32, Junio C Hamano wrote: > >> With or without the above plan, what we saw from you were a bit >> messy to queue. The --keep-empty fix series is based on 'maint', >> while the --signoff series depends on changes that happened to

Re: [PATCH 0/2] rebase --recreate-merges --keep-empty: don't prune empty

On 20/03/18 19:32, Junio C Hamano wrote: > Phillip Wood writes: > >> On 20/03/18 15:42, Johannes Schindelin wrote: >> ... >>> As indicated in another reply, I'd rather rebase the --recreate-merges >>> patches on top of your --keep-empty patch series. This obviously

Re: [PATCH 0/2] rebase --recreate-merges --keep-empty: don't prune empty

Phillip Wood writes: > On 20/03/18 15:42, Johannes Schindelin wrote: > ... >> As indicated in another reply, I'd rather rebase the --recreate-merges >> patches on top of your --keep-empty patch series. This obviously means >> that I would fold essentially all of your

Re: [PATCH 0/2] rebase --recreate-merges --keep-empty: don't prune empty

On 20/03/18 15:42, Johannes Schindelin wrote: > Hi Phillip, > > On Tue, 20 Mar 2018, Phillip Wood wrote: > >> From: Phillip Wood >> >> These patches apply on top of js/rebase-recreate-merge. They extend >> the --keep-empty fix from maint [1] to work with

Re: [PATCH 0/2] rebase --recreate-merges --keep-empty: don't prune empty

Hi Phillip, On Tue, 20 Mar 2018, Phillip Wood wrote: > From: Phillip Wood > > These patches apply on top of js/rebase-recreate-merge. They extend > the --keep-empty fix from maint [1] to work with --recreate-merges. As indicated in another reply, I'd rather rebase

[PATCH 0/2] rebase --recreate-merges --keep-empty: don't prune empty

From: Phillip Wood These patches apply on top of js/rebase-recreate-merge. They extend the --keep-empty fix from maint [1] to work with --recreate-merges. [1] https://public-inbox.org/git/20180320100315.15261-3-phillip.w...@talktalk.net/T/#u Phillip Wood (2): add