Mercurial's changeset evolution sounds really powerful and seems to address the 'git rebase and force push' problems that can occur.