diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-16 10:07:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-16 10:07:19 -0700 |
| commit | 6d681f0a3e1fd10d4f51df3a90af30f4de299f89 (patch) | |
| tree | 7a75a1e154a3e5077a100199f07260a040c245b6 /diff.c | |
| parent | 83a4904fad91c2de92140d344bee9912e89ee7d9 (diff) | |
| parent | c215d3d2826c882feb819e5743287ec74d9ff693 (diff) | |
| download | git-6d681f0a3e1fd10d4f51df3a90af30f4de299f89.tar.gz git-6d681f0a3e1fd10d4f51df3a90af30f4de299f89.tar.xz | |
Merge branch 'jl/status-added-submodule-is-never-ignored'
submodule.*.ignore and diff.ignoresubmodules are used to ignore all
submodule changes in "diff" output, but it can be confusing to
apply these configuration values to status and commit.
This is a backward-incompatible change, but should be so in a good
way (aka bugfix).
* jl/status-added-submodule-is-never-ignored:
commit -m: commit staged submodules regardless of ignore config
status/commit: show staged submodules regardless of ignore config
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions