I think we should add a git hook preventing committing of 'dumb' merges caused by 'git pull' on master. In other words, force people to either rebase or work on branches and merge those. Maybe we can do this via checking commit ids on both parents. The easy & dumb way would be matching commit mesages for: Merge branch 'master' of git+ssh://git.gentoo.org/repo/gentoo and likes.
dwfreed: I've been wondering old bug about this in light of the right vs left parent discussion. If we included a hook that forced merge parents to be correct, we'd also have to publish an official way of fixing anybody's rejected tree. Any suggestions on doing so?
