From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Mar 2017 17:59:27 +0000 (-0700)
Subject: Merge branch 'sb/describe-broken'
X-Git-Tag: v2.13.0-rc0~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=844768a29864cac01d55463a8858457f4908d91e;p=thirdparty%2Fgit.git

Merge branch 'sb/describe-broken'

"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
---

844768a29864cac01d55463a8858457f4908d91e