Chose better tag names in git-describe after merges.