aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-29 11:13:22 -0800
committerJunio C Hamano <gitster@pobox.com>2012-03-02 09:33:29 -0800
commit70eb130768d17c33b9efbf60d7953cf6a57daecb (patch)
tree86a3ed637e235a66004258cffc0d8166f1c9bf7c
parente0a4aae865862549c5f2a65016d4d264843e7914 (diff)
downloadgit-70eb130768d17c33b9efbf60d7953cf6a57daecb.tar.gz
git-70eb130768d17c33b9efbf60d7953cf6a57daecb.tar.xz
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 <luke@diamand.org> Helped-by: Thomas Rast <trast@inf.ethz.ch> Helped-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/revisions.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index b290b617d..172566183 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