From: Junio C Hamano Date: Wed, 29 Feb 2012 19:13:22 GMT Subject: Re*: Tilde spec - befuzzled Message-ID: <7v8vjltpv1.fsf_-_@alter.siamese.dyndns.org> In-Reply-To: <4F4DF096.9050905@op5.se> Andreas Ericsson writes: > On 02/28/2012 08:20 PM, Junio C Hamano wrote: >> Thomas Rast writes: >> >>>>> '{tilde}', e.g. 'master{tilde}3':: >>>>> A suffix '{tilde}' to a revision parameter means the commit >>>>> object that is theth generation grand-parent of the named >>>>> commit object, following only the first parents. >>>>> >>>>> Hang on, *grand*-parents? >>>>> ... >>> >>> Perhaps we should reword it as "n-th first-parent ancestor"? Barring >>> confusion about the position of the dashes, that leaves little room for >>> error. >> >> I think we could either go "easier to read but not precise" >> >> ... that is theth generation (grand-)parent of ... > > (grand-)parent and ancestor are interchangeable while the parentheses > remain, although the former looks a bit clumsier in text. Ok, then something like this... -- >8 -- Subject: Documentation: do not assume that n > 1 in ~$n We explained ~ as th generation grand-parent, but a reader got confused by the "grand-" part when is 1. Reword it with "ancestor"; with the "generation" and "following only the first parents" around there, what we try to describe should be clear enough now. Noticed-by: Luke Diamand Helped-by: Thomas Rast Helped-by: Andreas Ericsson Signed-off-by: Junio C Hamano --- Documentation/revisions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index b290b61..1725661 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -101,7 +101,7 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file. '{tilde}', e.g. 'master{tilde}3':: A suffix '{tilde}' to a revision parameter means the commit - object that is the th generation grand-parent of the named + object that is the th generation ancestor of the named commit object, following only the first parents. I.e. '{tilde}3' is equivalent to '{caret}{caret}{caret}' which is equivalent to '{caret}1{caret}1{caret}1'. See below for an illustration of