diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:36:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:36:25 -0700 |
| commit | cc34bb0b0279a79117978cf220d70b1c14da05ca (patch) | |
| tree | 83ea20e7109b8d96caf0aeed855656d03968f0df /commit.h | |
| parent | 06d11b2e8d9d78d01212024f0f410e4193cbb5bd (diff) | |
| parent | 90e14525f22c2980d4375dcb5d79e6d5da293a78 (diff) | |
| download | git-cc34bb0b0279a79117978cf220d70b1c14da05ca.tar.gz git-cc34bb0b0279a79117978cf220d70b1c14da05ca.tar.xz | |
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
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions