[GIT PULL] git-gui pull request

The following changes since commit 2864e855932540c3ec6c9bf41ee3fe027d85f642:

  Merge branch 'os/catch-rename' (2024-07-07 14:14:59 +0200)

are available in the Git repository at:

  https://github.com/j6t/git-gui.git 

for you to fetch changes up to e5033898da23b6e2f6b77320bd0aa613595a50a1:

  Merge branch 'ob/strip-comments-on-commit' (2024-11-09 14:37:45 +0100)

----------------------------------------------------------------
Johannes Sixt (2):
      Merge branch 'tb/mergetool-from-config'
      Merge branch 'ob/strip-comments-on-commit'

Oswald Buddenhagen (2):
      git-gui: strip comments and consecutive empty lines from commit messages
      git-gui: strip commit messages less aggressively

Tobias Boesch (1):
      git gui: add directly calling merge tool from configuration

 lib/commit.tcl    | 11 ++++++++++-
 lib/mergetool.tcl | 21 +++++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)