crizCraig, modifying the public history is a very big *no no* and is never okay for big projects - you're thinking of "git pull --rebase", which prevents merge commits when pulling. The devs should follow a "proper" publishing system, and by this I mean Git Flow (or similar) - right now I think it's just a bit messy.