Thread (4 messages) flat view 4 messages, 2 authors, 2016-06-15

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

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:42

Paolo Bonzini [off-list ref] 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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help