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

Hi Phillip, On Tue, 20 Mar 2018, Phillip Wood wrote: > From: Phillip Wood > > If there are empty commits on the left hand side of $upstream...HEAD > then the empty commits on the right hand side that we want to keep are > pruned because they are marked as cherry-picks. Fix this by keeping > the

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

From: Phillip Wood If there are empty commits on the left hand side of $upstream...HEAD then the empty commits on the right hand side that we want to keep are pruned because they are marked as cherry-picks. Fix this by keeping the commits that are empty or are not marked as cherry-picks. Signed-