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

Re: [PATCH 0/6] Initial subproject support (RFC?)

From: David Kågedal <hidden>
Date: 2016-06-15 22:43:03

Junio C Hamano [off-list ref] writes:
$ git rebase HEAD lt/gitlink

This will take us back on lt/gitlink branch, set the tip of the
branch to the commit we just made with the fix-up, and the first
round will try to apply the change lt/gitlink~3 brings in on top
of our HEAD.  This _will_ fail, but that is to be expected, as
we intend to replace that with what we just amended.  Just reset
it away and keep going.

$ git reset --hard
$ git rebase --skip
Wouldn't

$ git rebase --onto HEAD lt/gitlink~3 lt/gitlink

do the trick in one step?

-- 
David Kågedal
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help