From: Björn Steinbrink Date: Sun, 25 Jan 2009 17:18:21 GMT Subject: Re: Heads up: major rebase -i -p rework coming up Message-ID: <20090125171821.GA5881@atjola.homenet> In-Reply-To: <200901251722.53392.jnareb@gmail.com> On 2009.01.25 17:22:52 +0100, Jakub Narebski wrote: > Or perhaps: > > merge A' D' into B Merge bla/blub That would be confusing. I'd read it as: git checkout B git merge A' D' But the point of B is just to tell rebase that the original merge commit B is replaced by this new merge commit, so that B' works later. Björn