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

Doing a git pull will insert the "Merge branch" messages, that's just what it does. By doing a git pull, you have merged the remote branch into your local branch.

When you do a git pull and there are conflicts, the git log will show the updates to the conflicted files as coming from the user that resolved the conflicts. I assume this is because the person that fixes the conflict re-commits the file.

As far as I know that's just how git works, and there is not a way around it.

Rebasing will blow away the git history, so you won't be able to see when merges occurred.