Merge branch 'js/maint-rebase-i-submodule'
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 02:07:55 +0000 (18:07 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 02:07:55 +0000 (18:07 -0800)
* js/maint-rebase-i-submodule:
  Fix submodule squashing into unrelated commit
  rebase -i squashes submodule changes into unrelated commit

1  2 
git-rebase--interactive.sh
t/t3404-rebase-interactive.sh

Simple merge
Simple merge