Eric Raymond <esr@xxxxxxxxxxxxxxxxx> writes:
> First, the documentation issues, in roughly increasing order of severity:
> ...
These all fall within "Patches welcome" category (meaning: I agree the
documentation can be improved and I don't object to changing them).
> D. How do I tell the conflict/no-conflict cases apart?
> ...
> Illustrative case: I see the status code "DD". How do I distinguish
> between case 4 ("deleted from index") and case 10 ("unmerged, both
> deleted")?
Is that DD really "illustrative", or did you mean to say "only/sole"?
You should never get "DD" in non-conflicting case. I think I was fairly
careful not to make them ambiguous when I did that code, but apparently I
wasn't so careful about the documentation.
Thanks for going through this area with fine comb.
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 1cab91b..313dd04 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -86,7 +86,7 @@ and `Y` shows the status of the work tree. For untracked paths, `XY` are
[MD] not updated
M [ MD] updated in index
A [ MD] added to index
- D [ MD] deleted from index
+ D [ M] deleted from index
R [ MD] renamed in index
C [ MD] copied in index
[MARC] index and work tree matches
--
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