You should rebase instead of merging when pulling though otherwise you contaminate your branch with merges that mess up the git log.

Alternatively you can squash the merges before pushing but this still requires rebasing.