From: Johannes Sixt Date: Mon, 20 Aug 2007 09:35:28 GMT Subject: Re: [PATCH] A more sensible error message why 'git rebase --continue' failed Message-ID: <46C96060.7AC79FAD@eudaptics.com> In-Reply-To: <11875724181583-git-send-email-evan@fallingsnow.net> Evan Phoenix wrote: > > The current message is a bit cryptic, indicating that only changes which contained > merge conflicts should be added to the index, but in fact, all outstanding > changes must be. I don't think that all files must be added if rebase -m was used: in this case, non-conflicting changes are already in the index. -- Hannes