* git rebase --interactive problem
@ 2009-08-21 21:12 Lenka Dubcova
2009-08-21 21:18 ` Alex Riesen
0 siblings, 1 reply; 2+ messages in thread
From: Lenka Dubcova @ 2009-08-21 21:12 UTC (permalink / raw)
To: git
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: git rebase --interactive problem
2009-08-21 21:12 git rebase --interactive problem Lenka Dubcova
@ 2009-08-21 21:18 ` Alex Riesen
0 siblings, 0 replies; 2+ messages in thread
From: Alex Riesen @ 2009-08-21 21:18 UTC (permalink / raw)
To: Lenka Dubcova; +Cc: git
On Fri, Aug 21, 2009 at 23:12, Lenka Dubcova<dubcova@gmail.com> 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"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-08-21 21:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-21 21:12 git rebase --interactive problem Lenka Dubcova
2009-08-21 21:18 ` Alex Riesen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).