summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-22 17:17:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-22 17:17:34 (GMT)
commitbba6acb335e296ed692b4aea224b50fd098f693c (patch)
treebcfc75dd8f4706be2a19a51120c14b32cda473c5
parent5c0b13f85ab3a5326508b854768eb70c8829cda4 (diff)
parentd31f3ad23dd1aee3c3e1015a43b02b995c01a9a1 (diff)
downloadgit-bba6acb335e296ed692b4aea224b50fd098f693c.zip
git-bba6acb335e296ed692b4aea224b50fd098f693c.tar.gz
git-bba6acb335e296ed692b4aea224b50fd098f693c.tar.bz2
Merge branch 'maint-1.9' into maint
* maint-1.9: 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 987395d..54143a0 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`