Don't like pull, use merge --ff-only instead