Advocacy vs. git

[Augie Fackler]

On Apr 25, 2009, at 1:38 AM, Colin Caughie wrote:

>> Two final points that I think are worth making.  First, "git rebase
>> -i" is nicer than MQ simply because you don't have to do much in the
>> way of setup.  If you have done a series of commits, and then decide
>> that, before you've pushed them out, that you want to squash two
>> commits together, and perhaps edit the commit log for a third, you
>> can
>> use "git rebase -i" for quickly and easily.  With MQ you have to
>> spend
>> a bit more time setting up the mq.  The functionality is equivalent,
>> but it's just perhaps less convient for ad hoc use.
>
> You can also use "hg rebase --collapse" to collapse the commits  
> you're rebasing (equivalent of git's squash). For more control over  
> what gets collapsed, or to collapse even when not rebasing, you can  
> use my collapse extension at http://bitbucket.org/ccaughie/hgcollapse/wiki/Home 
> .

If you want to do more (reorder changes, drop some changes), you can  
also take a look at my histedit extension [1] which is directly  
inspired by Git's interactive rebase. Word of warning: it doesn't yet  
play nice with mq. Then again, it's replaced most of my uses of mq, so  
I don't care about that as much as I thought I would.

[1] http://bitbucket.org/durin42/histedit/


> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial