Make git-pull complain and give advice when there is nothing to merge with