startsiden/startsiden-playpen — comment on commit 3379b3ee6f5dac76ed5ce4eafa4a1f9e47b7080f
File:  line 0
By zdk:

yep, when upstream and local branch diverge, ```git pull``` does ```git-fetch``` and ```git-merge``` automatically unless you specify ```--rebase``` option not to merge but rebase instead for pulling.

or use ```git fetch``` and then ```git rebase ```

It will get rather cleaner history.