Merge branch 'jc/describe-always'

* jc/describe-always:
  describe --always: fall back to showing an abbreviated object name

diff --cc builtin-describe.c
Simple merge