The linked webpage does not mention git pull --rebase. The author talks about problems with setting the configuration options of git pull to any one default, bu

The linked webpage does not mention git pull --rebase. The author talks about problems with setting the configuration options of git pull to any one default, but doesn't address the fact that we can perform a fetch, merge, rebase in one command when necessary with "git pull --rebase". The default configuration is preserved in this case. That said, I have none of the issues the SO guy has. It's insane that he has so many problems with people "cleaning up" a remote's history by making it more linear than it actually is. You should never force push and you should never rebase pushed commits. There are very few exceptions to this rule.