So actually reverting a merge in git isn't that painful. It's typically just git revert -m 1 sha_1_of_merge_commit
The problem is that if you then do more work on the branch and fix the problems that caused the merge to be reverted, redoing the merge doesn't work the way you expect; the commits that were previously merged don't get re-merged. So re-merging the branch consists of reverting the revert and then merging to get the new commits. Which is painful in-as-much as it requires you to know about the previous revert.
My favoured solution to this is to never merge, always rebase, which also has the property of giving a nice linear history that can actually be understood. However some people prefer a merge-based workflow (and if you happen to use github it is very difficult to enforce anything else, due to the Big Green Button), so it is a real problem.
I agree with your "always rebase" method, the readable history is well worth it alone.
This also gives you a chance to fix up any conflicts before merging, instead of possibly having to merge twice.
if i merge two branches, push that to the remote and i wan't to undo it.