Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> writes: > Actually, what you're adding is precisely what was already documented > right below: > >> * A colon, optionally followed by a stage number (0 to 3) and a >> colon, followed by a path; this names a blob object in the > index at the given path. Missing stage number (and the colon > that follows it) names a stage 0 entry. During a merge, stage > 1 is the common ancestor, stage 2 is the target branch's version > (typically the current branch), and stage 3 is the version from > the branch being merged. > > Probably it's not obvious enough and your patch is worth it, but then > it would be less confusing if you added "(see next item)." at the end > of your sentence. Another possibility is to swap the order of presentation. It might reduce the confusion of ':path' form appearing to be a variant of 'tree:path', and that is what invited the "what happens when tree is an empty string" question, I think. -- 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