| commit | 967476966513564e9c28847f7a974b8af5093493 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Jan 2009 09:07:31 +0000 (27 01:07 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 28 Jan 2009 22:54:58 +0000 (28 14:54 -0800) | ||
| tree | 87e3f7b25350a3798ef3d52fc1994c39af41f0b0 | treesnapshot (tar.gz zip) |
| parent | 02322e1619dc537dc48650761f6c9bae883612a7 | commitdiff |
rebase -i squashes submodule changes into unrelated commit
Attempting to rebase three-commit series (two regular changes, followed by
one commit that changes what commit is bound for a submodule path) to
squash the first two results in a failure; not just the first two commits
squashed, but the change to the submodule is also included in the result.
This failure causes the subsequent step to "pick" the change that actually
changes the submodule to be applied, because there is no change left to be
applied.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Attempting to rebase three-commit series (two regular changes, followed by
one commit that changes what commit is bound for a submodule path) to
squash the first two results in a failure; not just the first two commits
squashed, but the change to the submodule is also included in the result.
This failure causes the subsequent step to "pick" the change that actually
changes the submodule to be applied, because there is no change left to be
applied.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3404-rebase-interactive.sh | diffblobblamehistory |