From: Lea Wiemann Date: Sun, 22 Jun 2008 03:21:53 GMT Subject: git rebase --continue error message Message-ID: <485DC551.9020807@gmail.com> The error message for git rebase --continue is misleading if no rebase is in progress: $ git rebase --abort No rebase in progress? $ git rebase --continue You must edit all merge conflicts and then mark them as resolved using git add Anyone care to fix it?