No, problem with git rebase is that it allows you to do this. Read this part of the git manual: man git-rebase | grep -P "^RECOVERING" -A200 | less Phases ar

No, problem with git rebase is that it allows you to do this. Read this part of the git manual: man git-rebase | grep -P "^RECOVERING" -A200 | less Phases are actually a feature that git wants (last idea here): https://github.com/peff/git/wiki/SoC-2012-Ideas https://github.com/peff/git/wiki/SoC-2012-Ideas You have some ways you can work with this in hg using phases. One example is to mark the repo you're publishing to as non-publishing so that hg knows it's safe to edit history pushed to that repo. Another way is to just tell hg that you know better and to use "hg phase --force --draft" whatever commits you want to histedit or rebase.