summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-04 15:17:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-04 15:17:09 (GMT)
commit02377cf4bc6050cdbf600ce65114a5438b049763 (patch)
treedbd54f78a83512f4f088e5799209ce730e77811f /object.c
parenta2c6726417db22bea7a878aeb88e18bcc95e5c0c (diff)
parent23b4c7bcc58431beaf9c870a2d6b2ad4fb088a9f (diff)
downloadgit-02377cf4bc6050cdbf600ce65114a5438b049763.zip
git-02377cf4bc6050cdbf600ce65114a5438b049763.tar.gz
git-02377cf4bc6050cdbf600ce65114a5438b049763.tar.bz2
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
Diffstat (limited to 'object.c')
0 files changed, 0 insertions, 0 deletions