From: Steffen Prohaska <prohaska@zib.de>
Date: Mon, 30 Jul 2007 08:25:25 GMT
Subject: Re: merge time
Message-ID: <E1575DD6-AC8C-49FD-A765-801A19E1FA73@zib.de>
In-Reply-To: <20070730081439.GA907@coredump.intra.peff.net>


On Jul 30, 2007, at 10:14 AM, Jeff King wrote:

>
> How about "git commit-tree HEAD^{tree} -p HEAD"?

Thanks, I wasn't aware of this syntax.

> But I think making a "fake" commit to force non-fast-forward is the
> wrong thing. You really want to make your "extra" commit be the merge
> that wouldn't have happened (which unfortunately is not as simple as
> just creating a commit by hand, since you have to actually _do_ the
> merge to get the tree).

I agree. But I think except for being 'fake' there shouldn't be any
problems with the extra commit.

	Steffen