diff options
| author | Andreas Heiduk <asheiduk@gmail.com> | 2019-05-05 16:07:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-07 15:09:06 (GMT) |
| commit | 4ad1b2c7a6bf4c7ef017cd2b3baeb7bea8b8c48d (patch) | |
| tree | ebe8588f6d8ae3fb1f4c987eab8e70816c5fb8c5 /Documentation | |
| parent | 6a12e99a52d2d01ea84e5040a87e0dac0a4b0b35 (diff) | |
| download | git-4ad1b2c7a6bf4c7ef017cd2b3baeb7bea8b8c48d.zip git-4ad1b2c7a6bf4c7ef017cd2b3baeb7bea8b8c48d.tar.gz git-4ad1b2c7a6bf4c7ef017cd2b3baeb7bea8b8c48d.tar.bz2 | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/revisions.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index b5d9d1b..b0ac4cf 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -195,19 +195,16 @@ existing tag object. Depending on the given text, the shell's word splitting rules might require additional quoting. -'<rev>:<path>', e.g. 'HEAD:README', ':README', 'master:./README':: +'<rev>:<path>', e.g. 'HEAD:README', 'master:./README':: A suffix ':' followed by a path names the blob or tree at the given path in the tree-ish object named by the part before the colon. - ':path' (with an empty part before the colon) - is a special case of the syntax described next: content - recorded in the index at the given path. A path starting with './' or '../' is relative to the current working directory. The given path will be converted to be relative to the working tree's root directory. This is most useful to address a blob or tree from a commit or tree that has the same tree structure as the working tree. -':<n>:<path>', e.g. ':0:README', ':README':: +':[<n>:]<path>', e.g. ':0:README', ':README':: A colon, optionally followed by a stage number (0 to 3) and a colon, followed by a path, names a blob object in the index at the given path. A missing stage number (and the colon |