Merge branch 'js/add-e-submodule-fix'
commitee8d52f83985ba897dab2829823fbcfe40083cf6
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2012 22:08:27 +0000 (10 14:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2012 22:08:27 +0000 (10 14:08 -0800)
treee1fa156f8f4a80eca16443857d17bebacaaaab92
parent3d8bc74127bbb583bc437214a1d6c9afcf77646c
parent701825de23da2bff6c784d33ff27f75e802abd81
Merge branch 'js/add-e-submodule-fix'

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