git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 0/6] rebase: command "ref" and options --rewrite-{refs,heads,tags}

From
Greg Price <price@mit.edu>
Date
Jun 28, 2011, 13:17 UTC
Message-ID
<20110628131717.GA6822@dr-wily.mit.edu>
In-Reply-To
<20110628104758.GS5771@dr-wily.mit.edu>
On Tue, Jun 28, 2011 at 06:47:58AM -0400, Greg Price wrote:
Show 8 quoted lines
> I agree with your footnote -- the more general case will require a
> more powerful sequencer to support properly.  And now I see that
> Ramkumar Ramachandra is making progress on such a thing right now!
> That's great news -- this is a project that has been attempted at
> least four times, by five people (including me), in the last three
> years.  I hope to see this round make it in -- I was actually thinking
> about returning to the problem after seeing this series through, but I
> would be glad to see Ram beat me to it.
[Hello, Ram!]

Hmm, on further reading I'm not sure the sequencer Ram aims to build this summer actually extends to the "mark" and "reset" commands (or the concepts of "the rewritten <commit>" and "detach" in the pseudo-TODO notation of your footnote) that would be required to implement this broader rewrite-side-branches feature. It looks like the focus may be on taking the existing features of rebase and bringing them into C.

This sounds great too -- it should make rebase a lot faster -- but it will leave open the pet project I've thought about returning to, of making "rebase -i -p" work correctly even when the user wants to rearrange the commits rather than just s/pick/edit/ etc. That will require implementing a richer sequencer very like the one required for a general rewrite-side-branches feature.

Ram, have I correctly read your plans?  For context, see Junio's
remarks upthread about one thing a richer sequencer could be used for:
  http://thread.gmane.org/gmane.comp.version-control.git/176339/focus=176359
Greg
Previous: Greg PriceNext: Ramkumar Ramachandra
Message 19 of 24 in “rebase: command "ref" and options --rewrite-{refs,heads,tags}”
  1. 0/6 rebase: command "ref" and options --rewrite-{refs,heads,tags}Greg Price, Jun 27, 2011
  2. 1/6 rebase -i: Add the "ref" commandGreg Price, Oct 10, 2009
  3. Junio C HamanoJun 27, 2011
  4. Greg PriceJun 28, 2011
  5. 2/6 pretty: Add %D for script-friendly decorationGreg Price, Nov 18, 2009
  6. Junio C HamanoJun 27, 2011
  7. 4/6 rebase: --rewrite-{refs,heads,tags} to pull refs along with branchGreg Price, Nov 18, 2009
  8. Phil HordJun 27, 2011
  9. Greg PriceJun 28, 2011
  10. 3/6 for-each-ref: --stdin to match specified refs against patternGreg Price, Jan 7, 2010
  11. 5/6 t/lib-rebase.sh: pass through ref commandsGreg Price, Jan 25, 2010
  12. 6/6 rebase --rewrite-refs: testsGreg Price, Jan 25, 2010
  13. Phil HordJun 27, 2011
  14. Greg PriceJun 28, 2011
  15. Junio C HamanoJun 27, 2011
  16. Greg PriceJun 28, 2011
  17. Junio C HamanoJun 27, 2011
  18. Greg PriceJun 28, 2011
  19. Greg PriceJun 28, 2011
  20. Ramkumar RamachandraJun 30, 2011
  21. Sverre RabbelierAug 3, 2011
  22. Greg PriceAug 3, 2011
  23. Junio C HamanoJun 27, 2011
  24. Greg PriceJun 28, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.