summaryrefslogtreecommitdiff
path: root/git-gui/Makefile
diff options
context:
space:
mode:
authorLibravatar Jens Lehmann <Jens.Lehmann@web.de>2014-04-08 21:30:51 +0200
committerLibravatar Pat Thoyts <patthoyts@users.sourceforge.net>2014-06-13 18:27:33 +0100
commite0db1dd7d4bc87825f0d7d743f1a01b4461a59ff (patch)
tree49dcf04b8c40762603dfbabe954ea324317c7027 /git-gui/Makefile
parentgit-gui 0.19 (diff)
downloadtgif-e0db1dd7d4bc87825f0d7d743f1a01b4461a59ff.tar.xz
git-gui: show staged submodules regardless of ignore config
Currently setting submodule.<name>.ignore and/or diff.ignoreSubmodules to "all" suppresses all output of submodule changes for git-gui. This is really confusing, as even when the user chooses to record a new commit for an ignored submodule by adding it manually this change won't show up under "Staged Changes (Will Commit)". Fix that by using the '--ignore-submodules=dirty' option for both callers of "git diff-index --cached" when the underlying git version supports that option. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Diffstat (limited to 'git-gui/Makefile')
0 files changed, 0 insertions, 0 deletions