]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'master' of https://github.com/j6t/git-gui
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 May 2025 16:03:01 +0000 (09:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 May 2025 16:03:01 +0000 (09:03 -0700)
commitfcfe60668e05ffde2610bfef9045797618c145ac
tree16afb5b7ca43ab64de02c79363b80515ff259e1d
parent6ab5693aa298f0e3034a1273cf4bf61c31b0e7f0
parent61f8788fe9d362efb112f69a58cf0510a7e49ee0
Merge branch 'master' of https://github.com/j6t/git-gui

* 'master' of https://github.com/j6t/git-gui:
  git-gui: wire up support for the Meson build system
  git-gui: stop including GIT-VERSION-FILE file
  git-gui: extract script to generate macOS app
  git-gui: extract script to generate macOS wrapper
  git-gui: extract script to generate "tclIndex"
  git-gui: extract script to generate "git-gui"
  git-gui: drop no-op GITGUI_SCRIPT replacement
  git-gui: make output of GIT-VERSION-GEN source'able
  git-gui: prepare GIT-VERSION-GEN for out-of-tree builds
  git-gui: replace GIT-GUI-VARS with GIT-GUI-BUILD-OPTIONS
12 files changed:
git-gui/.gitattributes
git-gui/.gitignore
git-gui/GIT-GUI-BUILD-OPTIONS.in
git-gui/GIT-VERSION-GEN
git-gui/Makefile
git-gui/generate-git-gui.sh
git-gui/generate-macos-app.sh
git-gui/generate-macos-wrapper.sh
git-gui/generate-tclindex.sh
git-gui/lib/meson.build
git-gui/meson.build
git-gui/po/meson.build