summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2010-06-27 15:15:22 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-27 12:25:37 -0700
commit3f3abe3c5aa94a37bb57365262a9ad451c422e36 (patch)
tree66ac10be8b08beb9a9fca0045da311c363a5e72d
parentUpdate draft release notes to 1.7.1.1 (diff)
downloadtgif-3f3abe3c5aa94a37bb57365262a9ad451c422e36.tar.xz
git-rev-parse.txt: Document ":path" specifier
The empty treeish in ":path" means "index". This is actually a special case of the ":stage:path" syntax where it is documented, but mentioning it also together with "treeish:path" is helpful, so do it. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-rev-parse.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 8db600f6ba..d525e577b8 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -291,7 +291,9 @@ the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.
* A suffix ':' followed by a path; this names the blob or tree
at the given path in the tree-ish object named by the part
- before the colon.
+ 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 colon, optionally followed by a stage number (0 to 3) and a
colon, followed by a path; this names a blob object in the