Merge branch 'jl/submodule-ignore-diff'

* jl/submodule-ignore-diff:
  checkout: Use submodule.*.ignore settings from .git/config and .gitmodules
  checkout: Add test for diff.ignoreSubmodules
  checkout: respect diff.ignoreSubmodules setting

Conflicts:
	builtin/checkout.c

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin/checkout.c
index aae80c34cf79fa4fe04a03e48887d690db98047c,829442932f1711ecaea99180e7d3f6875f963832..560eae17159290c5adcefd2e2e2da5825ac6b75d
--- 1/builtin/checkout.c
--- 2/builtin/checkout.c
+++ b/builtin/checkout.c
@@@ -287,6 -281,8 +289,7 @@@ static void show_local_changes(struct o
        struct rev_info rev;
        /* I think we want full paths, even if we're in a subdirectory. */
        init_revisions(&rev, NULL);
 -      rev.abbrev = 0;
+       rev.diffopt.flags = opts->flags;
        rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS;
        if (diff_setup_done(&rev.diffopt) < 0)
                die("diff_setup_done failed");