Re: [RFC] git rebase -s ours

From: Mike Hommey <mh@glandium.org>
Date: Mar 3, 2008, 06:55 UTC
Message-ID: <20080303065521.GA18152@glandium.org>
In-Reply-To: <20080303054126.GB24210@coredump.intra.peff.net>

On Mon, Mar 03, 2008 at 12:41:26AM -0500, Jeff King wrote:

Show 7 quoted lines

> On Sun, Mar 02, 2008 at 01:48:48PM +0100, Mike Hommey wrote:
> 
> > I don't have a workflow in mind, but I have expectations: considering
> > the documentation, I would expect git rebase -s ours to do what git
> > filter-branch can do with grafts.
> 
> I'm not sure I follow. Can you elaborate?

Starting with a history like this:

                      G---H 
                     /
        A---B---C---D---E---F

Where A, B, C, ... are *trees*, not commits, the expected result would be

        A---B---C---D---E---F---G---H

This is what might happen with git-filter-branch if you graft G to F. (I don't know if it actually works in cases where the grafted commit had a parent, originally)

Mike