Julien Vermillard Wed, 10 Apr 2013 04:13:51 -0700
Hi, If you would like to avoid merge commit, use "git pull --rebase" in place of plain "git pull".
HTH Julien