Merge commits



   From: Raymond Toy <toy.raymond at gmail.com>

   You may have noticed that many times when you do a git pull to sync
   your local repo with the master, you get a merge commit.  And then
   when you push your changes to the repo, there are many of these merge
   commits.

   <snip>

   It's not necessary to do this, but I think it makes the tree a little
   cleaner.

Agreed.

It is also possible to prevent merge commits on the SF side...if we
should be inclined that way. This would enforce a policy of rebasing
before pushing.

Leo