Re: merge time

From: Jeff King <peff@peff.net>
Date: Jul 30, 2007, 08:14 UTC
Message-ID: <20070730081439.GA907@coredump.intra.peff.net>
In-Reply-To: <577C7529-4C3C-40D4-B86A-8B3CE888C997@zib.de>

On Mon, Jul 30, 2007 at 10:09:16AM +0200, Steffen Prohaska wrote:

Show 5 quoted lines

> I needed to slightly modify it
>
>     git config --global alias.force-commit \
>     '! git update-ref HEAD $(echo MARK | git commit-tree $(git cat-file 
> commit HEAD | grep ^tree | cut -b 6-) -p HEAD)'

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

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).

-Peff