mbox series

[PULL] git-gui pull request

Message ID 91307087-2934-4037-b4c3-9691f8540c12@kdbg.org (mailing list archive)
State Accepted
Commit b31fb630c0fc6869a33ed717163e8a1210460d94
Headers show
Series [PULL] git-gui pull request | expand

Pull-request

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

Message

Johannes Sixt Nov. 9, 2024, 1:50 p.m. UTC 
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(-)

Comments

Junio C Hamano Nov. 11, 2024, 5:54 a.m. UTC | #1 
Johannes Sixt <j6t@kdbg.org> writes:

> 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)

Thanks.


>
> ----------------------------------------------------------------
> 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(-)