diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2024-12-21 14:05:43 +0100 |
|---|---|---|
| committer | Johannes Sixt <j6t@kdbg.org> | 2024-12-21 14:06:33 +0100 |
| commit | 5c95773eacee6eeecc16506fad3ca7fe6bf249be (patch) | |
| tree | bef63b230f4dde2af5f995f0cab17b1da76071ad /git-gui.sh | |
| parent | 0668f0470d68d297bc463027d66668e34a3b1f80 (diff) | |
| parent | f823de75a1f4f061c78aa6fff500f35be8d38e69 (diff) | |
| download | git-5c95773eacee6eeecc16506fad3ca7fe6bf249be.tar.xz | |
Merge branch 'js/no-rescan-on-empty-diff'
* js/no-rescan-on-empty-diff:
git-gui: Remove forced rescan of stat-dirty files.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Diffstat (limited to 'git-gui.sh')
| -rwxr-xr-x | git-gui.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-gui.sh b/git-gui.sh index 8fe7538e72..887d6d596c 100755 --- a/git-gui.sh +++ b/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 |