summaryrefslogtreecommitdiff
path: root/t/t4117-apply-reject.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-27 01:07:31 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-28 14:54:58 -0800
commit967476966513564e9c28847f7a974b8af5093493 (patch)
tree87e3f7b25350a3798ef3d52fc1994c39af41f0b0 /t/t4117-apply-reject.sh
parentsend-pack: do not send unknown object name from ".have" to pack-objects (diff)
downloadtgif-967476966513564e9c28847f7a974b8af5093493.tar.xz
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>
Diffstat (limited to 't/t4117-apply-reject.sh')
0 files changed, 0 insertions, 0 deletions