Code

Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Mar 2009 04:45:02 +0000 (21:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Mar 2009 04:45:02 +0000 (21:45 -0700)
commit54e7e7891b75741ba745e783dd5c5f488f377438
tree61a78c7f536a73b6cfaafee7595fc35680a9826e
parentdaf713dd497ef04855ccecf90ad9aafb17769681
parent94c88edef7a69299e12248b910752f1fc26f12d6
Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1

* js/maint-1.6.1-rebase-i-submodule:
  Fix submodule squashing into unrelated commit
  rebase -i squashes submodule changes into unrelated commit