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 /builtin/send-pack.c | |
| parent | Merge branch 'ml/rebase-x-strategy' (diff) | |
| parent | Add tests for the diff.ignoreSubmodules config option (diff) | |
| download | tgif-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 'builtin/send-pack.c')
0 files changed, 0 insertions, 0 deletions