]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff795a5 1bc815c)
Merge branch 'ps/build-hotfix' into ma/asciidoctor-build-fixes
authorJunio C Hamano <gitster@pobox.com>
Sat, 21 Dec 2024 01:34:25 +0000 (17:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 21 Dec 2024 01:34:25 +0000 (17:34 -0800)
* 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

1  2 
GIT-VERSION-GEN patch | diff1 | diff2 | blob | history
Makefile patch | diff1 | diff2 | blob | history

diff --cc GIT-VERSION-GEN
Simple merge
diff --cc Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.