> "Sure, but you hit the problem twice as often in git, because you have to do twice as many things." Well no, I don't... If this really is a frequent problem

> "Sure, but you hit the problem twice as often in git, because you have to do twice as many things." Well no, I don't... If this really is a frequent problem for you, then you might want to consider adding a note to the end of git-commit's output to remind you to push, or even just aliasing git-commit to push by default. I would recommend that you instead learn how to use git, but failing that... > "In SVN that doesn't show up as a merge in the history." If you don't want to resolve those situations with a merge, then don't resolve those situations with a merge... Rebasing exists for a reason.