I did that for several months in 2010. It's too error prone; you will forget to have that configured somewhere and get a merge by mistake.
So then I trained myself on "pull --rebase". I soon realized, I don't want to be combining fetch and rebase. The best way was to just scrub the pull command from the vocabulary.
It's fine nowadays but there was a time when "git pull --rebase" worked slightly differently to "git fetch" and "git rebase". I'd get conflicts with the former that I didn't get with the latter.
Comments
I've had it enabled by default for years and years. It's always what I want.
I did that for several months in 2010. It's too error prone; you will forget to have that configured somewhere and get a merge by mistake.
So then I trained myself on "pull --rebase". I soon realized, I don't want to be combining fetch and rebase. The best way was to just scrub the pull command from the vocabulary.
It's fine nowadays but there was a time when "git pull --rebase" worked slightly differently to "git fetch" and "git rebase". I'd get conflicts with the former that I didn't get with the latter.