git rebase --interactive problem

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

git rebase --interactive problem

From: Lenka Dubcova <hidden>
Date: 2016-06-15 22:47:17

Hi,

I wanted to squash one commit to another using git rebase --interactive
HEAD~2, but I made a typo, instead of squash I wrote sqaush, so it stopped
and left this message

Unknown command: sqaush 43ce3ae my commit message
Please fix this in the file
/home/lenka/hermes2d/.git/.dotest-merge/git-rebase-todo.

Moreover it jumped from my branch to (no branch).

So I corrected it in "git-rebase-todo" and saved, but I don't know what to
do next.

Thanks,
Lenka
-- 
View this message in context: http://n2.nabble.com/git-rebase-interactive-problem-tp3492625p3492625.html
Sent from the git mailing list archive at Nabble.com.

Re: git rebase --interactive problem

From: Alex Riesen <hidden>
Date: 2016-06-15 22:47:17

On Fri, Aug 21, 2009 at 23:12, Lenka Dubcova[off-list ref] wrote:
Unknown command: sqaush 43ce3ae my commit message
Please fix this in the file
/home/lenka/hermes2d/.git/.dotest-merge/git-rebase-todo.

Moreover it jumped from my branch to (no branch).

So I corrected it in "git-rebase-todo" and saved, but I don't know what to
do next.
Try "git rebase --continue"
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help