]> git.ipfire.org Git - thirdparty/git.git/commit
Merge https://github.com/j6t/git-gui
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 Nov 2024 03:47:44 +0000 (12:47 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Nov 2024 03:47:44 +0000 (12:47 +0900)
commitb31fb630c0fc6869a33ed717163e8a1210460d94
treef5dec9d70d06e8b5095ed20c66cea490ef095795
parentfacbe4f633e4ad31e641f64617bc88074c659959
parente5033898da23b6e2f6b77320bd0aa613595a50a1
Merge https://github.com/j6t/git-gui

* https://github.com/j6t/git-gui:
  git gui: add directly calling merge tool from configuration
  git-gui: strip commit messages less aggressively
  git-gui: strip comments and consecutive empty lines from commit messages
git-gui/lib/commit.tcl
git-gui/lib/mergetool.tcl