Merge branch 'jl/submodule-diff-dirtiness'
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Mar 2010 23:25:43 +0000 (16:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Mar 2010 23:25:43 +0000 (16:25 -0700)
* jl/submodule-diff-dirtiness:
git status: ignoring untracked files must apply to submodules too
git status: Fix false positive "new commits" output for dirty submodules
Refactor dirty submodule detection in diff-lib.c
git status: Show detailed dirty status of submodules in long format
git diff --submodule: Show detailed dirty status of submodules

1  2 
diff-lib.c
diff.c
wt-status.c
diff --cc diff-lib.c
Simple merge
diff --cc diff.c
Simple merge
diff --cc wt-status.c
Simple merge