Re: Automatically identifying the "split" point of a merged branch.

From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Jul 31, 2011, 06:08 UTC
Message-ID: <CAOTq_psXsjipBxcG+86bQvPwQj866iAf_c9nQJ=KvjCjYHtySg@mail.gmail.com>
In-Reply-To: <20110731055310.GA14384@sigill.intra.peff.net>

On Sat, Jul 30, 2011 at 10:53 PM, Jeff King <peff@peff.net> wrote:

Show 8 quoted lines

> On Sat, Jul 30, 2011 at 05:54:59PM -0700, Conrad Irwin wrote:
>
> If you know M, then B is the merge-base of M^1 and M^2 (i.e., the
> parents of M). If you don't know M, but do know D, you can find it by
> walking backwards from "integration" until you find a merge commit with
> D as its second parent (e.g., by grepping "rev-list --parents").
>
> Make sense?

Yup. git rev-list was definitely the tool I was missing, thank you :).

Conrad

merge=$(git rev-list --parents integration |\
                 grep " $(git rev-parse topic)" | cut -d' ' -f 1)
split=$(git merge-base $merge^ $merge^2)
git rebase --onto master $split
git checkout master
git merge --no-ff topic