As a general rule ''always'' use <tt>git pull --rebase</tt> to avoid creating unnecessary merge commits. Note that one must have no uncommitted edits when running <tt>git pull</tt>.
The differences between "git pull" and git pull --rebase" is explained well [http://stackoverflow.com/a/3357174/2615612 here].
To review your changes before a commit, type: