diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-12-26 08:02:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-12-26 08:02:23 -0800 |
| commit | 76cf4f61c87855ebf0784b88aaf737d6b09f504b (patch) | |
| tree | ed7c817bbe0b64a8aebae7feec79aeb4b743b436 /git-gui/git-gui.sh | |
| parent | 996f0c583b36aa5d6c6308285aea1421eb7efae7 (diff) | |
| parent | 5c95773eacee6eeecc16506fad3ca7fe6bf249be (diff) | |
Merge https://github.com/j6t/git-gui
* 'master' of https://github.com/j6t/git-gui:
git-gui: use system encoding to show console output
git-gui: Remove forced rescan of stat-dirty files.
Diffstat (limited to 'git-gui/git-gui.sh')
| -rwxr-xr-x | git-gui/git-gui.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 8fe7538e72..887d6d596c 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -1357,7 +1357,6 @@ set current_diff_path {} set is_3way_diff 0 set is_submodule_diff 0 set is_conflict_diff 0 -set diff_empty_count 0 set last_revert {} set last_revert_enc {} @@ -3594,6 +3593,8 @@ $ui_diff tag configure clr1 -font font_diffbold $ui_diff tag configure clr4 -underline 1 $ui_diff tag conf d_info -foreground blue -font font_diffbold +$ui_diff tag conf d_rescan -foreground blue -underline 1 -font font_diffbold +$ui_diff tag bind d_rescan <Button-1> { clear_diff; rescan ui_ready 0 } $ui_diff tag conf d_cr -elide true $ui_diff tag conf d_@ -font font_diffbold |