tree dbd54f78a83512f4f088e5799209ce730e77811f
parent a2c6726417db22bea7a878aeb88e18bcc95e5c0c
parent 23b4c7bcc58431beaf9c870a2d6b2ad4fb088a9f
author Junio C Hamano <gitster@pobox.com> 1283613429 -0700
committer Junio C Hamano <gitster@pobox.com> 1283613429 -0700

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