![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Aug 2010 19:36:25 +0000 (12:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Aug 2010 19:36:25 +0000 (12:36 -0700) | ||
| commit | cc34bb0b0279a79117978cf220d70b1c14da05ca | |
| tree | 83ea20e7109b8d96caf0aeed855656d03968f0df | tree | snapshot |
| parent | 06d11b2e8d9d78d01212024f0f410e4193cbb5bd | commit | diff |
| parent | 90e14525f22c2980d4375dcb5d79e6d5da293a78 | commit | diff |
Merge branch 'jl/submodule-ignore-diff'
* jl/submodule-ignore-diff:
Add tests for the diff.ignoreSubmodules config option
Add the 'diff.ignoreSubmodules' config setting
Submodules: Use "ignore" settings from .gitmodules too for diff and status
Submodules: Add the new "ignore" config option for diff and status
Conflicts:
diff.c
* jl/submodule-ignore-diff:
Add tests for the diff.ignoreSubmodules config option
Add the 'diff.ignoreSubmodules' config setting
Submodules: Use "ignore" settings from .gitmodules too for diff and status
Submodules: Add the new "ignore" config option for diff and status
Conflicts:
diff.c
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| Documentation/diff-options.txt | diff1 | | diff2 | | blob | history |
| builtin/commit.c | diff1 | | diff2 | | blob | history |
| diff.c | diff1 | | diff2 | | blob | history |