Documentation: do not assume that n > 1 in <rev>~$n

gitster · gitster · commit 70eb130768d1 · 2012-03-02T09:33:29.000-08:00
We explained &lt;rev&gt;~&lt;n&gt; as &lt;n&gt;th generation grand-parent, but a reader got
confused by the "grand-" part when &lt;n&gt; 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 &lt;luke@diamand.org&gt;
Helped-by: Thomas Rast &lt;trast@inf.ethz.ch&gt;
Helped-by: Andreas Ericsson &lt;ae@op5.se&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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.
 
 '<rev>{tilde}<n>', e.g. 'master{tilde}3'::
   A suffix '{tilde}<n>' to a revision parameter means the commit
-  object that is the <n>th generation grand-parent of the named
+  object that is the <n>th generation ancestor of the named
   commit object, following only the first parents.  I.e. '<rev>{tilde}3' is
   equivalent to '<rev>{caret}{caret}{caret}' which is equivalent to
   '<rev>{caret}1{caret}1{caret}1'.  See below for an illustration of
