Merge branch 'jl/submodule-ignore-diff'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:36:25 +0000 (12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:36:25 +0000 (12:36 -0700)
* jl/submodule-ignore-diff:
Add tests for the diff.ignoreSubmodules config option
Add the 'diff.ignoreSubmodules' config setting
Submodules: Use "ignore" settings from .gitmodules too for diff and status
Submodules: Add the new "ignore" config option for diff and status

Conflicts:
diff.c

No differences found