![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 1 Feb 2009 02:07:55 +0000 (18:07 -0800) | ||
| committer | Junio 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
Fix submodule squashing into unrelated commit
rebase -i squashes submodule changes into unrelated commit
| 1 | 2 | |||
|---|---|---|---|---|
| git-rebase--interactive.sh | patch | | diff1 | | diff2 | | blob | history |
| t/t3404-rebase-interactive.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc git-rebase--interactive.sh
Simple merge
diff --cc t/t3404-rebase-interactive.sh
Simple merge