mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-16 21:01:42 +02:00
Code

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

Browse Source 
* https://github.com/j6t/git-gui:
  git-gui: fix inability to quit after closing another instance
  git-gui: sv.po: Update Swedish translation (576t0f0u)
  git-gui: note the new maintainer
  Makefile(s): do not enforce "all indents must be done with tab"
  Makefile(s): avoid recipe prefix in conditional statements
  doc: switch links to https
  doc: update links to current pages
  git-gui: po: fix typo in French "aperçu"
This commit is contained in:
Junio C Hamano 2024-07-07 22:50:37 -07:00
commit 5c9be4c9d6
4 changed files with 1782 additions and 1709 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-gui/README.md
View File

@ -42,8 +42,8 @@ You probably need to have root/admin permissions to install.
# Contributing # Contributing
The project is currently maintained by Pratyush Yadav over at The project is currently maintained by Johannes Sixt at
https://github.com/prati0100/git-gui. Even though the project is hosted at https://github.com/j6t/git-gui. Even though the project is hosted at
GitHub, the development does not happen over GitHub Issues and Pull Requests. GitHub, the development does not happen over GitHub Issues and Pull Requests.
Instead, an email based workflow is used. The Git mailing list Instead, an email based workflow is used. The Git mailing list
[git@vger.kernel.org](mailto:git@vger.kernel.org) is where the patches are [git@vger.kernel.org](mailto:git@vger.kernel.org) is where the patches are

2
git-gui/git-gui.sh
View File

@ -2301,7 +2301,7 @@ proc do_quit {{rc {1}}} {
# #
set save [gitdir GITGUI_MSG] set save [gitdir GITGUI_MSG]
if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} { if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
file rename -force [gitdir GITGUI_BCK] $save catch { file rename -force [gitdir GITGUI_BCK] $save }
set GITGUI_BCK_exists 0 set GITGUI_BCK_exists 0
} elseif {[$ui_comm edit modified]} { } elseif {[$ui_comm edit modified]} {
set msg [string trim [$ui_comm get 0.0 end]] set msg [string trim [$ui_comm get 0.0 end]]

2
git-gui/po/fr.po
View File

@ -1646,7 +1646,7 @@ msgstr "Dépôt Git (sous projet)"
#: lib/diff.tcl:222 #: lib/diff.tcl:222
msgid "* Binary file (not showing content)." msgid "* Binary file (not showing content)."
msgstr "* Fichier binaire (pas d'apperçu du contenu)." msgstr "* Fichier binaire (pas d'aperçu du contenu)."
#: lib/diff.tcl:227 #: lib/diff.tcl:227
#, tcl-format #, tcl-format

3483
git-gui/po/sv.po
View File

File diff suppressed because it is too large Load Diff