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 <asheiduk@gmail.com> Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Andreas Heiduk committed
May 5, 2019 at 12:07 UTC
4ad1b2c7a6bf4c7ef017cd2b3baeb7bea8b8c48d
1 file changed
+2
-5
Documentation/revisions.txt
+2
-5
@@ -195,19 +195,16 @@ existing tag object.
195
Depending on the given text, the shell's word splitting rules might
196
require additional quoting.
197
198
-'<rev>:<path>', e.g. 'HEAD:README', ':README', 'master:./README'::
198
+'<rev>:<path>', e.g. 'HEAD:README', 'master:./README'::
199
A suffix ':' followed by a path names the blob or tree
200
at the given path in the tree-ish object named by the part
201
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.
202
A path starting with './' or '../' is relative to the current working directory.
203
The given path will be converted to be relative to the working tree's root directory.
204
This is most useful to address a blob or tree from a commit or tree that has
205
the same tree structure as the working tree.
206
210
-':<n>:<path>', e.g. ':0:README', ':README'::
207
+':[<n>:]<path>', e.g. ':0:README', ':README'::
208
A colon, optionally followed by a stage number (0 to 3) and a
209
colon, followed by a path, names a blob object in the
210
index at the given path. A missing stage number (and the colon