Merge branch 'sp/describe-tag'
commitb00ac8c729258f7117c74838133d57c40536b48b
authorJunio C Hamano <gitster@pobox.com>
Sun, 2 Mar 2008 23:19:59 +0000 (2 15:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 2 Mar 2008 23:19:59 +0000 (2 15:19 -0800)
treec6742ca688d08414bf9df4f8cc8b176ad646cb56
parentac6aa16279ec06633070f5ab9ca414136a292395
parent212945d4a85dfa172ea55ec73b1d830ef2d8582f
Merge branch 'sp/describe-tag'

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

Conflicts:

builtin-describe.c
builtin-describe.c