![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 4 Sep 2010 15:17:09 +0000 (08:17 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 4 Sep 2010 15:17:09 +0000 (08:17 -0700) | ||
| commit | 02377cf4bc6050cdbf600ce65114a5438b049763 | |
| tree | dbd54f78a83512f4f088e5799209ce730e77811f | tree | snapshot |
| parent | a2c6726417db22bea7a878aeb88e18bcc95e5c0c | commit | diff |
| parent | 23b4c7bcc58431beaf9c870a2d6b2ad4fb088a9f | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |
| builtin/checkout.c | diff1 | | diff2 | | blob | history |