Re: [PATCH 2/2] rebase: fix preserving commits with --keep-empty

On Thu, Dec 10, 2015 at 02:58:06PM -0800, Michael Blume wrote: > This test does not seem to pass on my mac. > > I've placed the verbose output here: > https://gist.github.com/MichaelBlume/db7ba222be001d502e57 > > On Fri, Nov 20, 2015 at 4:04 AM, Patrick Steinhardt wrote: > > When

Re: [PATCH 2/2] rebase: fix preserving commits with --keep-empty

This test does not seem to pass on my mac. I've placed the verbose output here: https://gist.github.com/MichaelBlume/db7ba222be001d502e57 On Fri, Nov 20, 2015 at 4:04 AM, Patrick Steinhardt wrote: > When rebasing commits where one or several commits are redundant > to commits on

[PATCH 2/2] rebase: fix preserving commits with --keep-empty

When rebasing commits where one or several commits are redundant to commits on the branch that is being rebased upon we error out. This is due to the usage of `--allow-empty` for the invoked cherry-pick command, which will only cause _empty_ commits to be picked instead of also allowing redundant