Rebase regression in v1.7.9?
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Jan 31, 2012, 22:56 UTC
- Message-ID
- <CAMP44s1EAwHjQ7S2ArLvhNg5qkR05DRJ70tQmP8sXYdOP=i_zQ@mail.gmail.com>
Hi,
Try the following steps:
% git checkout -b tmp v1.7.9 % git cherry-pick 6e1c9bb^2^ % git rebase -i --onto 6e1c9bb HEAD^ % git rebase --continue
The rebase will finish, but there will be a .git/CHERRY_PICK_HEAD file.
This doesn't happen if you run rebase without -i, or do rebase --skip instead.
IIRC correctly rebase --continue used to work fine.
Cheers.
-- Felipe Contreras