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

Re: git rebase -i

From: Jeff King <hidden>
Date: 2016-06-15 22:46:14

On Thu, Feb 19, 2009 at 11:15:51AM +0100, Wincent Colaiuta wrote:
quoted
Actually, I don't think that's true anymore with "rebase -i"; it is
probably most convenient way in core git to rewrite the history of a
patchset. E.g., a core part of my workflow as a contributor is:

 $ git checkout -b jk/topic origin
 $ while true; do hack hack hack; commit commit commit; done
 $ git rebase -i origin

which gives me a list of everything on the topic, ready to be
reordered, squashed, or edited as appropriate.
Yes, I do the same. But notice that you did "git rebase -i -- 
quoted
quoted
quoted
origin<<<---". Seems to me you are definitely _thinking_ in terms of 
your topic _branch_ and not in terms of "the last few commits".
Perhaps. I think of it as "the set of commits not yet published"
(since I publish only by sending patches to Junio, and he is my origin)
and nothing to do with the topic branch itself.

But we are just quibbling over minor terminology. I think we both agree
that HEAD~10 is silly and abitrary.

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