diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-02 19:49:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-02 19:49:06 (GMT) |
| commit | 2fa91bd3919f1654d69b43d8c808d7b277c688f5 (patch) | |
| tree | 2056ca3e0c7e81b2e48ffad16f08381dd8ad7e8b /Documentation | |
| parent | 7bb3beaf4fe81176aa2946e639ee75b1a9d4744c (diff) | |
| parent | 70eb130768d17c33b9efbf60d7953cf6a57daecb (diff) | |
| download | git-2fa91bd3919f1654d69b43d8c808d7b277c688f5.zip git-2fa91bd3919f1654d69b43d8c808d7b277c688f5.tar.gz git-2fa91bd3919f1654d69b43d8c808d7b277c688f5.tar.bz2 | |
Merge branch 'maint'
* maint:
Documentation: do not assume that n > 1 in <rev>~$n
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/revisions.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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. '<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 |