[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: [PATCH] A more sensible error message why 'git rebase --continue'
From:       Johannes Sixt <J.Sixt () eudaptics ! com>
Date:       2007-08-20 9:35:28
Message-ID: 46C96060.7AC79FAD () eudaptics ! com
[Download RAW message or body]

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

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]