Skip to content

Commit 4ad1b2c

Browse files
asheidukgitster
authored andcommitted
revisions.txt: remove ambibuity between <rev>:<path> and :<path>
The revision ':README' is mentioned as an example for '<rev>:<path>' but the explanation forwards to the ':<n>:<path>' syntax. At the same time ':<n>:<path>' did not mark the '<n>:' as optional. Signed-off-by: Andreas Heiduk <[email protected]> Signed-off-by: Denton Liu <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6a12e99 commit 4ad1b2c

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

Documentation/revisions.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,19 +195,16 @@ existing tag object.
195195
Depending on the given text, the shell's word splitting rules might
196196
require additional quoting.
197197

198-
'<rev>:<path>', e.g. 'HEAD:README', ':README', 'master:./README'::
198+
'<rev>:<path>', e.g. 'HEAD:README', 'master:./README'::
199199
A suffix ':' followed by a path names the blob or tree
200200
at the given path in the tree-ish object named by the part
201201
before the colon.
202-
':path' (with an empty part before the colon)
203-
is a special case of the syntax described next: content
204-
recorded in the index at the given path.
205202
A path starting with './' or '../' is relative to the current working directory.
206203
The given path will be converted to be relative to the working tree's root directory.
207204
This is most useful to address a blob or tree from a commit or tree that has
208205
the same tree structure as the working tree.
209206

210-
':<n>:<path>', e.g. ':0:README', ':README'::
207+
':[<n>:]<path>', e.g. ':0:README', ':README'::
211208
A colon, optionally followed by a stage number (0 to 3) and a
212209
colon, followed by a path, names a blob object in the
213210
index at the given path. A missing stage number (and the colon

0 commit comments

Comments
 (0)