Code

Merge branch 'jl/maint-submodule-gitfile-awareness'
authorJunio C Hamano <gitster@pobox.com>
Sat, 10 Apr 2010 19:13:46 +0000 (12:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 10 Apr 2010 19:13:46 +0000 (12:13 -0700)
* jl/maint-submodule-gitfile-awareness:
  Teach diff --submodule and status to handle .git files in submodules


Trivial merge