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

Re: rebase-with-history -- a technique for rebasing without trashing your repo history

From
Nanako Shiraishi <nanako3@lavabit.com>
Date
Aug 14, 2009, 21:40 UTC
Message-ID
<20090815064001.6117@nanako3.lavabit.com>
In-Reply-To
<4A85D53D.9050805@alum.mit.edu>
Quoting Michael Haggerty <mhagger@alum.mit.edu>
Show 7 quoted lines
> In [1] I compared rebase-with-history with both of the
> currently-available options (rebase and merge).  Rebase and merge can
> each deal with some of the issues that come up, but each one falls flat
> on others.  I believe that rebase-with-history has the advantages of both.
> ....  Rebase-with-history is obviously
> not an earth-shattering revolution in DVCS technology, but my hope is
> that it could unobtrusively assist with a few minor pain points.
The saddest part is that your [1] works only in a case a user can easily handle manually, and doesn't help cases more complex than the most trivial ones, such as reordering and squashing commits, where the user may benefit if an automated support from VCS were available.
-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/
Previous: Michael HaggertyNext: Björn Steinbrink
Message 6 of 10 in “rebase-with-history -- a technique for rebasing without trashing your repo history”
  1. Michael HaggertyAug 13, 2009
  2. Björn SteinbrinkAug 13, 2009
  3. Michael HaggertyAug 13, 2009
  4. Björn SteinbrinkAug 13, 2009
  5. Michael HaggertyAug 14, 2009
  6. Nanako ShiraishiAug 14, 2009
  7. Björn SteinbrinkAug 15, 2009
  8. Sitaram ChamartyAug 14, 2009
  9. Bryan O'SullivanAug 13, 2009
  10. Abderrahim KitouniAug 13, 2009

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.