| Message ID | 0e91e811-5f0d-42c5-94be-8dafa575f6cb@kdbg.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 76cf4f61c87855ebf0784b88aaf737d6b09f504b |
| Headers | show |
| Series | [PULL] git-gui: console encoding, no automatic empty-diff-rescan | expand |
Johannes Sixt <j6t@kdbg.org> writes: > The following changes since commit e5033898da23b6e2f6b77320bd0aa613595a50a1: > > Merge branch 'ob/strip-comments-on-commit' (2024-11-09 14:37:45 +0100) > > are available in the Git repository at: > > https://github.com/j6t/git-gui.git master > > for you to fetch changes up to 5c95773eacee6eeecc16506fad3ca7fe6bf249be: > ... > git-gui.sh | 3 ++- > lib/console.tcl | 2 +- > lib/diff.tcl | 26 ++++++-------------------- > 3 files changed, 9 insertions(+), 22 deletions(-) Thanks. Pulled.
The following changes since commit e5033898da23b6e2f6b77320bd0aa613595a50a1: Merge branch 'ob/strip-comments-on-commit' (2024-11-09 14:37:45 +0100) are available in the Git repository at: https://github.com/j6t/git-gui.git master for you to fetch changes up to 5c95773eacee6eeecc16506fad3ca7fe6bf249be: Merge branch 'js/no-rescan-on-empty-diff' (2024-12-21 14:06:33 +0100) This comes with the following feature: * No longer show a "No difference detected" popup that must be confirmed with a mouse click, but show a message in the diff panel instead. The rescan that was started automatically when a popup was confirmed must now be requested explicitly. This helps when a rescan does not get rid of the empty diffs, such as after a change of the core.autocrlf configuration. There is also a bug fix: * Treat the output of git commands that is shown in the console window as text in the system encoding instead of as binary bytes. ---------------------------------------------------------------- Johannes Sixt (3): git-gui: Remove forced rescan of stat-dirty files. Merge branch 'yk/console-encoding' Merge branch 'js/no-rescan-on-empty-diff' Yuri Konotopov (1): git-gui: use system encoding to show console output git-gui.sh | 3 ++- lib/console.tcl | 2 +- lib/diff.tcl | 26 ++++++-------------------- 3 files changed, 9 insertions(+), 22 deletions(-)