Andrew's git / gitweb.git / diff
?
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)
* js/maint-1.6.1-rebase-i-submodule:
Fix submodule squashing into unrelated commit
rebase -i squashes submodule changes into unrelated commit

Trivial merge