Agreed. But you then also need to merge with --no-ff to avoid polluting your master. Renaming for public branches rebase is also a must to avoid push force drama.
For aliases and shell/git configuration, a few pearls:
with oh-my-zsh/git and others according to your tastes. (♥ gloga)
--rebase by default on git pull is comfortable too.
And obviously for those that didn't know it:
We’re a place where coders share, stay up-to-date and grow their careers.
We strive for transparency and don't collect excess data.