summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Orgad Shaneh <orgads@gmail.com>2012-09-23 09:37:47 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-24 09:28:36 -0700
commit8f6811efed5451c72aac53f8ee12b1edcd426a73 (patch)
treea45344bfe278fa516673d05d1345e468333d0941 /mergetools
parentGit 1.7.3 (diff)
downloadtgif-8f6811efed5451c72aac53f8ee12b1edcd426a73.tar.xz
commit: pay attention to submodule.$name.ignore in .gitmodules
"git status" does not list a submodule with uncommitted working tree files as modified when "submodule.$name.ignore" is set to "dirty" in in-tree ".gitmodules" file. Both status and commit honor the setting in $GIT_DIR/config, but "commit" does not pick it up from .gitmodules, which is inconsistent. Teach "git commit" to pay attention to the setting in .gitmodules as well. Signed-off-by: Orgad Shaneh <orgads@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions