From: Jeff King Date: Mon, 03 Mar 2008 05:41:26 GMT Subject: Re: [RFC] git rebase -s ours Message-ID: <20080303054126.GB24210@coredump.intra.peff.net> In-Reply-To: <20080302124848.GB8696@glandium.org> 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? -Peff