Merge branch 'sb/describe-broken'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Mar 2017 17:59:27 +0000 (10:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Mar 2017 17:59:28 +0000 (10:59 -0700)
"git describe --dirty" dies when it cannot be determined if the
state in the working tree matches that of HEAD (e.g. broken
repository or broken submodule). The command learned a new option
"git describe --broken" to give "$name-broken" (where $name is the
description of HEAD) in such a case.

* sb/describe-broken:
builtin/describe: introduce --broken flag

Trivial merge