Skip to content

Commit 1758fc9

Browse files
Denton-Lgitster
authored andcommitted
revisions.txt: mention <rev>~ form
In revisions.txt, the '<rev>^' form is mentioned but the '<rev>~' form is missing. Although both forms are essentially equivalent (they each get the first parent of the specified revision), we should mention the latter for completeness. Make this change. While we're at it, the brief form of '<rev>^' makes it seem as if no numerical argument is accepted. Update documentation to make it obvious that an optional numerical argument is accepted. Signed-off-by: Denton Liu <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 268fbcd commit 1758fc9

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Documentation/revisions.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,17 @@ from one location and push to another. In a non-triangular workflow,
131131
This suffix is also accepted when spelled in uppercase, and means the same
132132
thing no matter the case.
133133

134-
'<rev>{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0'::
134+
'<rev>{caret}[<n>]', e.g. 'HEAD{caret}, v1.5.1{caret}0'::
135135
A suffix '{caret}' to a revision parameter means the first parent of
136136
that commit object. '{caret}<n>' means the <n>th parent (i.e.
137137
'<rev>{caret}'
138138
is equivalent to '<rev>{caret}1'). As a special rule,
139139
'<rev>{caret}0' means the commit itself and is used when '<rev>' is the
140140
object name of a tag object that refers to a commit object.
141141

142-
'<rev>{tilde}<n>', e.g. 'master{tilde}3'::
142+
'<rev>{tilde}[<n>]', e.g. 'HEAD{tilde}, master{tilde}3'::
143+
A suffix '{tilde}' to a revision parameter means the first parent of
144+
that commit object.
143145
A suffix '{tilde}<n>' to a revision parameter means the commit
144146
object that is the <n>th generation ancestor of the named
145147
commit object, following only the first parents. I.e. '<rev>{tilde}3' is

0 commit comments

Comments
 (0)