1
0
mirror of https://github.com/git/git.git synced 2024-10-22 23:58:22 +02:00

Merge branch 'maint'

* maint:
  Documentation: do not assume that n > 1 in <rev>~$n
This commit is contained in:
Junio C Hamano 2012-03-02 11:49:06 -08:00
commit 2fa91bd391

@ -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