Mercurial's addremove, now for Git

If you've been raised on mercurial, there are a few commands you just take for granted, "hg addremove" being one of them. Unfortunately, git has no equivalent built in, splitting the adding & removing into two separate commands.

If you're like me, this cannot stand. Nor should it, with a

The magical (and not harmful) rebase

After living in abject fear of ClearCase rebases and merges across version branches for the past few months, something like this makes me drool:

Git’s rebase allows you to temporarily rewind the commits you did in this branch, pull in everything from another branch and apply your commits on