Merge branch 'js/add-not-submodule' into maint
commit9e3248eb51ae6e376a4128846efe598f7fd6912f
authorJunio C Hamano <gitster@pobox.com>
Sat, 24 Jan 2009 03:00:43 +0000 (23 19:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 24 Jan 2009 03:00:43 +0000 (23 19:00 -0800)
tree0e8fb47f5852cc991c686b5c12a032d23afcaa5b
parent5cb0f2745f83c01ee94d1739b7476504b4e20216
parent2ce53f9b77eb36c6d1286f55fba65f8dc66b2564
Merge branch 'js/add-not-submodule' into maint

* js/add-not-submodule:
  git add: do not add files from a submodule