]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4e87565 b0176ce)
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)
commit844768a29864cac01d55463a8858457f4908d91e
tree162616606279e87603e772c02f1dbcf877bf999ftree | snapshot
parent4e87565d2a3e315b7afc39e9e1fe98c5607a1b11commit | diff
parentb0176ce6b5d954a747dc4d0c5a8593ed576714c4commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.