Code

Merge branch 'jl/submodule-ignore-diff'
authorJunio C Hamano <gitster@pobox.com>
Sat, 4 Sep 2010 15:17:09 +0000 (08:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 4 Sep 2010 15:17:09 +0000 (08:17 -0700)
commit02377cf4bc6050cdbf600ce65114a5438b049763
treedbd54f78a83512f4f088e5799209ce730e77811f
parenta2c6726417db22bea7a878aeb88e18bcc95e5c0c
parent23b4c7bcc58431beaf9c870a2d6b2ad4fb088a9f
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
Documentation/config.txt
builtin/checkout.c