Merge branch 'js/add-e-submodule-fix' into next
commitc8e2d28db0fdc977fe8d71ed45fdba39a4dfb701
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Feb 2012 04:45:57 +0000 (8 20:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Feb 2012 04:45:57 +0000 (8 20:45 -0800)
tree969edb8bf871d42aacddd6bc309936634b84c328
parent18459c49379591735ba1fe33bf4e163f94c3c5a2
parent701825de23da2bff6c784d33ff27f75e802abd81
Merge branch 'js/add-e-submodule-fix' into next

* js/add-e-submodule-fix:
  add -e: do not show difference in a submodule that is merely dirty
builtin/add.c