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@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html