On Wed, 04 May 2011 17:53:14 +0200, Ryan Leavengood <leavengood@xxxxxxxxx> wrote:
But another thing I like to do with git when pulling is git pull --rebase, which rebases my local commits after the remote changes, to avoid merge commits. I assume Mercurial has something similar, though I don't know for sure.
AFAIK, Git and Hg cover pretty much the same features, most having been added later to Hg by means of plugins. The table at the bottom of http://mercurial.selenic.com/wiki/GitConcepts shows this.