Give master commits two parents to allow fast-forward pushes