"Constantine A. Murenin" <muren...@gmail.com> writes: > Well, I now know this, but it wasn't clear from the documentation that > that was the behaviour.
Yes, the message "after you _resolved_, please tell me you are now done" is too fuzzy. What it wants to say is: I punted, because the patch does not apply, and it is stored here. Update the index to hold contents that the sender of the patch would have liked to see if the patch were to apply cleanly. Tell me when you are done, with "am --resolved". Then I'll commit that content in the index for you with the authorship and log message I learned from the e-mail and continue. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html