![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 10 Apr 2010 19:13:46 +0000 (12:13 -0700) | ||
| committer | Junio 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
Teach diff --submodule and status to handle .git files in submodules
Trivial merge