Git pull results in extraneous “Merge branch” messages in commit log

Question

I\'m working with another developer on a project, and we\'re using Github as our remote repo. I\'m on a Mac using git 1.7.7.3, he\'s on Windows using git 1.7.6.

This

Answer 1

You can do:

git pull --rebase

However, this will always put your changes on top of your collaborators'. But you won't get any polluting merge message.