projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 978327f 46a958b)
Merge branch 'jl/status-ignore-submodules'
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 Jun 2010 18:55:39 +0000 (11:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Jun 2010 18:55:39 +0000 (11:55 -0700)
commita76b2084fb9c7e788108717fdce4c91227808980
tree7fa7cd5019490a51bea649141c795786b9c85017tree | snapshot
parent978327f97dd3bd20f1648a2fcac601191976b18ccommit | diff
parent46a958b3daa1da336683ec82d7f321d0f51b39c8commit | diff
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
Documentation/git-status.txt diff1 | diff2 | blob | history
builtin/commit.c diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
git-submodule.sh diff1 | diff2 | blob | history
t/t7508-status.sh diff1 | diff2 | blob | history
wt-status.c diff1 | diff2 | blob | history
wt-status.h diff1 | diff2 | blob | history
Git—the stupid content tracker