None of these commands should use --rebase - if the user says pull, pull, if they want rebase they'll have it configured in their ~/.gitconfig or in every repo with the setting that automates that. I don't ever want to pull --rebase, period. I do want to rebase after fetching IF I have diverged AND I'm not going to force master back to where it should be. My settings have this:
[pull]
ff = only
Ie, fast forward, or fail. As it should be. But I don't want to enforce my beliefs on others in the world unless I'm working directly with them on the same repos :-D
None of these commands should use --rebase - if the user says pull, pull, if they want rebase they'll have it configured in their
~/.gitconfig
or in every repo with the setting that automates that. I don't ever want to pull --rebase, period. I do want to rebase after fetching IF I have diverged AND I'm not going to force master back to where it should be. My settings have this:Ie, fast forward, or fail. As it should be. But I don't want to enforce my beliefs on others in the world unless I'm working directly with them on the same repos :-D