Please avoid noisy merge commits in frameworks

[Thomas Zander]

söndagen den 19 februari 2012 14.36.07 skrev  Stephen Kelly:
> I was reviewing the changes in the frameworks branch from yesterday. 
> Something I noticed was that there are a lot of merge commits that don't 
> need to exist.

Heh, sounds familiar, the same thing was brought up when Qt switched to Git :)

I think the following simple rule should be presented to committers, but in 
general these merges can be ignored in listings so its a problem that can be 
solved on both sides.

Now the rule;
  If you have done commmits and *no* branching work at all, you should 
  pull using;
      "git pull --rebase"

The 'no branching work' is what 90% of the contributors will do, they just 
work on one branch all the time.
-- 
Thomas Zander