Junio,
I assume that a pull request like this is your preference. Let me know if anything can be improved.
Concerning the commits themselves:
- Mark Levedahl's are already in your tree, but I merged the branch as well, so they are mentioned in the summary.
- Josh's, Taylor's and your commits are cherry-picks of the parts concerning git-gui that are also in your tree.
- The other commits are new.
The tree of my commit 6a8c13e03daf is identical to your git-gui tree as of v2.45.0:
$ git rev-parse v2.45.0:git-gui 6a8c13e03daf: 8c60bdfc0dce346d1fff62e20ee548f9bb9b6de1 8c60bdfc0dce346d1fff62e20ee548f9bb9b6de1
--- The following changes since commit e25cbdf3576f07bda742a4f13d9380a815e43502:
Merge branch 'ml/cygwin-fixes' (2023-08-24 16:46:29 +0200)
are available in the Git repository at:
https://github.com/j6t/git-gui.git master
for you to fetch changes up to 2864e855932540c3ec6c9bf41ee3fe027d85f642:
Merge branch 'os/catch-rename' (2024-07-07 14:14:59 +0200)
----------------------------------------------------------------
Johannes Sixt (5):
Merge branch 'ml/git-gui-exec-path-fix'
git-gui: note the new maintainer
Merge branch 'bc/french-translation'
Merge branch 'pk/swedish-translation'
Merge branch 'os/catch-rename'Josh Soref (2):
doc: update links to current pages
doc: switch links to httpsJunio C Hamano (1):
Makefile(s): do not enforce "all indents must be done with tab"Mark Levedahl (2):
git-gui - re-enable use of hook scripts
git-gui - use git-hook, honor core.hooksPathOrgad Shaneh (1):
git-gui: fix inability to quit after closing another instancePeter Krefting (1):
git-gui: sv.po: Update Swedish translation (576t0f0u)Taylor Blau (1):
Makefile(s): avoid recipe prefix in conditional statementsbrian m. carlson (1):
git-gui: po: fix typo in French "aperçu".gitattributes | 1 + Makefile | 16 +- README.md | 4 +- git-gui.sh | 37 +- lib/encoding.tcl | 2 +- po/README | 2 +- po/fr.po | 2 +- po/sv.po | 3611 ++++++++++++++++++++++++++++-------------------------- 8 files changed, 1863 insertions(+), 1812 deletions(-)