From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 21 Dec 2024 01:34:25 +0000 (-0800)
Subject: Merge branch 'ps/build-hotfix' into ma/asciidoctor-build-fixes
X-Git-Tag: v2.48.0-rc1~7^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5f82c0d5f867e55d0a2125c82163c54b33ca2d4;p=thirdparty%2Fgit.git

Merge branch 'ps/build-hotfix' into ma/asciidoctor-build-fixes

* ps/build-hotfix:
  meson: add options to override build information
  GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATE
  GIT-VERSION-GEN: fix overriding GIT_VERSION
  Makefile: introduce template for GIT-VERSION-GEN
  Makefile: drop unneeded indirection for GIT-VERSION-GEN outputs
  Makefile: stop including "GIT-VERSION-FILE" in docs
---

f5f82c0d5f867e55d0a2125c82163c54b33ca2d4