summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-22 17:16:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-22 17:16:50 (GMT)
commitd31f3ad23dd1aee3c3e1015a43b02b995c01a9a1 (patch)
treea2e4916ff989c8f61c96f21bcc1208e381fbe435
parentd22acacf810a92d5634099a7db0367ce5b6fdcef (diff)
parente6aaa393478bf3ee9f4cde8d82cd258c034cd335 (diff)
downloadgit-d31f3ad23dd1aee3c3e1015a43b02b995c01a9a1.zip
git-d31f3ad23dd1aee3c3e1015a43b02b995c01a9a1.tar.gz
git-d31f3ad23dd1aee3c3e1015a43b02b995c01a9a1.tar.bz2
Merge branch 'maint-1.8.5' into maint-1.9
* maint-1.8.5: Documentation: fix missing text for rev-parse --verify
-rw-r--r--Documentation/git-rev-parse.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 0d2cdcd..55ea1a0 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -102,7 +102,7 @@ eval "set -- $(git rev-parse --sq --prefix "$prefix" "$@")"
+
If you want to make sure that the output actually names an object in
your object database and/or can be used as a specific type of object
-you require, you can add "^{type}" peeling operator to the parameter.
+you require, you can add "\^{type}" peeling operator to the parameter.
For example, `git rev-parse "$VAR^{commit}"` will make sure `$VAR`
names an existing object that is a commit-ish (i.e. a commit, or an
annotated tag that points at a commit). To make sure that `$VAR`