Here it is a practical recipe to make you prefer rebase merging (git rebase) over recursive merging (git merge) especially when it's time to integrate changes from others while working on a feature branch.
Following alias will come in handy:
git config --local alias.history 'log --oneline --decorate --graph'