| commit | 6d681f0a3e1fd10d4f51df3a90af30f4de299f89 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Jun 2014 17:07:19 +0000 (16 10:07 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Jun 2014 17:07:19 +0000 (16 10:07 -0700) | ||
| tree | 7a75a1e154a3e5077a100199f07260a040c245b6 | treesnapshot (tar.gz zip) |
| parent | 83a4904fad91c2de92140d344bee9912e89ee7d9 | commitdiff |
| parent | c215d3d2826c882feb819e5743287ec74d9ff693 | commitdiff |
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
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
| Documentation/config.txt | diff1 | diff2 | blobhistory |
| builtin/commit.c | diff1 | diff2 | blobhistory |
| t/t7508-status.sh | diff1 | diff2 | blobhistory |
| wt-status.c | diff1 | diff2 | blobhistory |