]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/enhanced-version-info'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Dec 2017 22:08:47 +0000 (14:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Dec 2017 22:08:47 +0000 (14:08 -0800)
"git version --build-options" learned to report the host CPU and
the exact commit object name the binary was built from.

* js/enhanced-version-info:
  version --build-options: report commit, too, if possible
  version --build-options: also report host CPU

1  2 
Makefile

diff --cc Makefile
Simple merge