"There is still a chance that between since the last git pull command someone has pushed a new commit. In that case a merge will occur in your history." If you

"There is still a chance that between since the last git pull command someone has pushed a new commit. In that case a merge will occur in your history." If you want to prevent these merge commits (I do, I think they're really ugly), you can add git config --global pull.ff = only