Merge branch 'master' into next
commitc76b8ba9136f90886c8aa87e8f1929bb5c6dc6f6
authorJunio C Hamano <gitster@pobox.com>
Sat, 10 Apr 2010 20:16:48 +0000 (10 13:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 10 Apr 2010 20:16:48 +0000 (10 13:16 -0700)
tree6a4205c43c3dbb97e52efea2f0d5faefd81455b5
parent94f6e3de72bc0c8f438fe32c191f5ded314dafa1
parentb9aa901856cee7ad16737343f6a372bb37871258
Merge branch 'master' into next

* master:
  Git 1.7.1-rc1
  Teach diff --submodule and status to handle .git files in submodules