| commit | a76b2084fb9c7e788108717fdce4c91227808980 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 Jun 2010 18:55:39 +0000 (30 11:55 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 Jun 2010 18:55:39 +0000 (30 11:55 -0700) | ||
| tree | 7fa7cd5019490a51bea649141c795786b9c85017 | treesnapshot (tar.gz zip) |
| parent | 978327f97dd3bd20f1648a2fcac601191976b18c | commitdiff |
| parent | 46a958b3daa1da336683ec82d7f321d0f51b39c8 | commitdiff |
Merge branch 'jl/status-ignore-submodules'
* jl/status-ignore-submodules:
Add the option "--ignore-submodules" to "git status"
git submodule: ignore dirty submodules for summary and status
Conflicts:
builtin/commit.c
t/t7508-status.sh
wt-status.c
wt-status.h
* jl/status-ignore-submodules:
Add the option "--ignore-submodules" to "git status"
git submodule: ignore dirty submodules for summary and status
Conflicts:
builtin/commit.c
t/t7508-status.sh
wt-status.c
wt-status.h