Merge branch 'js/maint-rebase-i-submodule'
commit29254142ddac335b33606c0036561f6df89f3d18
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 02:07:55 +0000 (31 18:07 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 02:07:55 +0000 (31 18:07 -0800)
treec500d1008639df21a9bee792e074e0bbc228b396
parentbdf6442b482e488fd34b2d749316312e0ee25a5b
parent94c88edef7a69299e12248b910752f1fc26f12d6
Merge branch 'js/maint-rebase-i-submodule'

* js/maint-rebase-i-submodule:
  Fix submodule squashing into unrelated commit
  rebase -i squashes submodule changes into unrelated commit
git-rebase--interactive.sh
t/t3404-rebase-interactive.sh