summaryrefslogtreecommitdiff
path: root/git-gui.sh
diff options
context:
space:
mode:
authorJens Lehmann <Jens.Lehmann@web.de>2009-07-21 19:32:31 +0200
committerShawn O. Pearce <spearce@spearce.org>2009-08-10 08:30:26 -0700
commit246295bdeb00ec6d533f22937992d1f9a06f8e71 (patch)
tree124aebb879a03a806437e3bfae804579e5e66570 /git-gui.sh
parenta91be3fcbe92c24e809b1ec85881a6da40a9a340 (diff)
downloadgit-246295bdeb00ec6d533f22937992d1f9a06f8e71.tar.xz
git-gui: display summary when showing diff of a submodule
As it is hard to say what changed in a submodule by looking at the hashes, let's show the colored submodule summary instead. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'git-gui.sh')
-rwxr-xr-xgit-gui.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-gui.sh b/git-gui.sh
index 14b92ba786..3c0ce26029 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -3212,7 +3212,7 @@ proc popup_diff_menu {ctxm ctxmmg x y X Y} {
set l [mc "Stage Hunk For Commit"]
set t [mc "Stage Line For Commit"]
}
- if {$::is_3way_diff
+ if {$::is_3way_diff || $::is_submodule_diff
|| $current_diff_path eq {}
|| {__} eq $state
|| {_O} eq $state