aboutsummaryrefslogtreecommitdiff
path: root/gitk-git
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-27 10:59:27 -0700
committerJunio C Hamano <gitster@pobox.com>2017-03-27 10:59:28 -0700
commit844768a29864cac01d55463a8858457f4908d91e (patch)
tree162616606279e87603e772c02f1dbcf877bf999f /gitk-git
parent4e87565d2a3e315b7afc39e9e1fe98c5607a1b11 (diff)
parentb0176ce6b5d954a747dc4d0c5a8593ed576714c4 (diff)
downloadgit-844768a29864cac01d55463a8858457f4908d91e.tar.gz
git-844768a29864cac01d55463a8858457f4908d91e.tar.xz
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
Diffstat (limited to 'gitk-git')
0 files changed, 0 insertions, 0 deletions