| commit | bd9ae9e97499694c91fb89c9f3d2037bb4275adc | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 29 Jun 2010 00:54:42 +0000 (28 17:54 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 29 Jun 2010 00:54:42 +0000 (28 17:54 -0700) | ||
| tree | 6660145cd8ad5b23492e9b86937a3fbcdc98996c | treesnapshot (tar.gz zip) |
| parent | 5144a8f2e42e8c81fa8c4027afa8a2b95075bac5 | commitdiff |
| parent | 46a958b3daa1da336683ec82d7f321d0f51b39c8 | commitdiff |
Merge branch 'jl/status-ignore-submodules' into next
* 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