From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 08 Jun 2008 20:59:16 GMT
Subject: Re: [PATCH] provide a new "theirs" strategy, useful for rebase --onto
Message-ID: <7vk5gziqxn.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <484BE0BE.1050102@gnu.org>

Paolo Bonzini <bonzini@gnu.org> writes:

>    #! /bin/sh
>    # git-merge-after-amend <branch>
>    #
>    # Makes it possible to do a fast-forward merge of <branch>
>    # into HEAD, assuming that the first diverging commit of <branch>
>    # is an --amend'ed version of the first diverging commit of HEAD.

Can this strong special case limitation "only the first one can be the
amend" somehow be loosened?  Otherwise I suspect it would not be useful as
a general solution.