Skip to content

Commit 70eb130

Browse files
committed
Documentation: do not assume that n > 1 in <rev>~$n
We explained <rev>~<n> as <n>th generation grand-parent, but a reader got confused by the "grand-" part when <n> 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 <[email protected]> Helped-by: Thomas Rast <[email protected]> Helped-by: Andreas Ericsson <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e0a4aae commit 70eb130

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/revisions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.
101101

102102
'<rev>{tilde}<n>', e.g. 'master{tilde}3'::
103103
A suffix '{tilde}<n>' to a revision parameter means the commit
104-
object that is the <n>th generation grand-parent of the named
104+
object that is the <n>th generation ancestor of the named
105105
commit object, following only the first parents. I.e. '<rev>{tilde}3' is
106106
equivalent to '<rev>{caret}{caret}{caret}' which is equivalent to
107107
'<rev>{caret}1{caret}1{caret}1'. See below for an illustration of

0 commit comments

Comments
 (0)