tree c6742ca688d08414bf9df4f8cc8b176ad646cb56
parent ac6aa16279ec06633070f5ab9ca414136a292395
parent 212945d4a85dfa172ea55ec73b1d830ef2d8582f
author Junio C Hamano <gitster@pobox.com> 1204499999 -0800
committer Junio C Hamano <gitster@pobox.com> 1204499999 -0800

Merge branch 'sp/describe-tag'

* sp/describe-tag:
  Teach git-describe to verify annotated tag names before output

Conflicts:

	builtin-describe.c