Git: each click on the original master causes a merge with the message

Question

Every time i do

git pull origin master 

Git pops up an editor and asks to write a comment about the merge before committing. Any idea why this might happen? Another developer is also working on a wizard and did not have this problem.

As far as I can tell, the branch configurations are correct. Besides this annoying merge that happens when I pull, I can discard changes and push changes as usual.

Answer 1

git pull - git fetch followed by git merge . Starting with Git 1.7.10, git merge pops up an editor when merging (see release notes ). Another developer is probably using an older version of Git.