Oliver Steele

I'm a happy Mercurial user (like simple things) but I'm interested in what Git has to offer to have a better workflow.

That is, with Mercurial you could do a similar workflow using queues. They are just a series of patches which are stacked over the history of your local repository. They can be reordered, pushed, poped... and whatnot.

So it would work like this.

hg qinit #init queues
hg qnew mywork #new queue patch

Now you do your work:

hg add
hg del
...
hg qrefresh #commits work to the top patch of queue (mywork). This is the checkpointing command

When you are happy with the patch and want to make it a "real" revision, just:

hg qremove --rev mywork

And that is, I don't know if I'm mising part of your workflow, please let me know what you think about this.