Re: [PATCH 8/8] rebase -i: introduce --recreate-merges=no-rebase-cousins

Hi Philip, On Thu, 18 Jan 2018, Philip Oakley wrote: > From: "Johannes Schindelin" > > This one is a bit tricky to explain, so let's try with a diagram: > > > >C > > / \ > > A - B - E - F > > \ / > >D > > > > To illustrate what this new mode is

Re: [PATCH 8/8] rebase -i: introduce --recreate-merges=no-rebase-cousins

On Thu, Jan 18, 2018 at 10:36 AM, Johannes Schindelin wrote: > This one is a bit tricky to explain, so let's try with a diagram: > [...] > Signed-off-by: Johannes Schindelin > --- > diff --git a/builtin/rebase--helper.c

Re: [PATCH 8/8] rebase -i: introduce --recreate-merges=no-rebase-cousins

From: "Johannes Schindelin" This one is a bit tricky to explain, so let's try with a diagram: C / \ A - B - E - F \ / D To illustrate what this new mode is all about, let's consider what happens upon `git rebase -i --recreate-merges B`, in

[PATCH 8/8] rebase -i: introduce --recreate-merges=no-rebase-cousins

This one is a bit tricky to explain, so let's try with a diagram: C / \ A - B - E - F \ / D To illustrate what this new mode is all about, let's consider what happens upon `git rebase -i --recreate-merges B`, in particular to the commit `D`. In the default mode, the new