From: Nanako Shiraishi Date: Fri, 14 Aug 2009 21:40:01 GMT Subject: Re: rebase-with-history -- a technique for rebasing without trashing your repo history Message-ID: <20090815064001.6117@nanako3.lavabit.com> In-Reply-To: <4A85D53D.9050805@alum.mit.edu> Quoting Michael Haggerty > 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/