Thread (1 message) 1 message, 1 author, 2016-06-15

Re: git rebase behaviour changed?

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

Junio C Hamano [off-list ref] writes:
You are right.  We will lose #1 and #2, (although the "already
up to date" might catch some cases) and this _is_ dangerous.  I
need to do something about this soon.
Actually, I think we are OK; I do not think we would lose any
commits.  git-format-patch (actually, git-cherry called from
there) does the right thing.  It does not use the merge base
done in git-rebase in any way.

In any case, we _do_ need an explanation and error-out upon
finding a merge, as we discussed.  If somebody really wants to
rebase a merge, he can do that by hand, as Mike easily
demonstrated.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help