diff options
| author |  Jens Lehmann <Jens.Lehmann@web.de> | 2014-04-08 21:36:08 +0200 |
|---|---|---|
| committer |  Paul Mackerras <paulus@samba.org> | 2014-06-15 11:35:50 +1000 |
| commit | 17f9836c8afc8d4b6d6bb91fd0658df090d75c8f (patch) | |
| tree | 59c0ed91aba31be5773da0cf67cc4c2a94404b00 /Documentation/git-cherry.txt | |
| parent | gitk: Allow displaying time zones from author and commit dates timestamps (diff) | |
| download | tgif-17f9836c8afc8d4b6d6bb91fd0658df090d75c8f.tar.xz | |
gitk: 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 gitk. 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
"Local changes checked in to index but not committed".
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: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'Documentation/git-cherry.txt')
0 files changed, 0 insertions, 0 deletions