Re: [PATCH] provide a new "theirs" strategy, useful for rebase --onto

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Paolo Bonzini <bonzini@xxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux