On Apr 1, 2014, at 2:37 PM, Junio C Hamano <gits...@pobox.com> wrote:

>> D           M    deleted from index
> 
> I doubt this is possible in practice ...
> 
>> D           D    unmerged, both deleted
>> A           U    unmerged, added by us
>> U           A    unmerged, added by them
> 
>   ... you would not see these three unless you are developing Git using a
> low-level plumbing machinery.

Thanks, that is very helpful.

The "C[ MD]" are now the remaining mystery

--
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

Reply via email to