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)
commit055e1e29696c0fb06582c1592ee6b58643dcc514
treec02d254d4cd428587da4556b16c550434b09f369
parent3b0c19663e7976cd32188b42e762c980d1bb93d4
parenteee49b6ce4b7b3fed28794676c67ad3609f658ac
Merge branch 'jl/maint-submodule-gitfile-awareness'

* jl/maint-submodule-gitfile-awareness:
  Teach diff --submodule and status to handle .git files in submodules