Merge branch 'js/add-e-submodule-fix' into maint
commit4daf6fc837f7cc84335958b9d9e8a29e41b4ee8e
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 19:42:18 +0000 (13 11:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 19:42:18 +0000 (13 11:42 -0800)
treea6fbd54fee0a3d58d91db28da0fa36b4ebb854d9
parent87cb3b82a42613dc3ffd1eddf95f8c306a045ad1
parent701825de23da2bff6c784d33ff27f75e802abd81
Merge branch 'js/add-e-submodule-fix' into maint

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