Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/prune-top-level-refs-after-packing' into maint
[gitweb.git]
/
git-gui
/
lib
/
diff.tcl
diff --git
a/git-gui/lib/diff.tcl
b/git-gui/lib/diff.tcl
index 30d9a797769b49cdd9d42fba925d8fa8ecbffb21..b0a5180af71ac04c58d2dd44664df98b67d3a770 100644
(file)
--- a/
git-gui/lib/diff.tcl
+++ b/
git-gui/lib/diff.tcl
@@
-287,6
+287,9
@@
proc start_show_diff {cont_info {add_opts {}}} {
if {$w eq $ui_index} {
lappend cmd diff-index
lappend cmd --cached
+ if {[git-version >= "1.7.2"]} {
+ lappend cmd --ignore-submodules=dirty
+ }
} elseif {$w eq $ui_workdir} {
if {[string first {U} $m] >= 0} {
lappend cmd diff