From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Jul 2014 17:17:34 +0000 (-0700)
Subject: Merge branch 'maint-1.9' into maint
X-Git-Tag: v2.0.3~18
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bba6acb335e296ed692b4aea224b50fd098f693c?hp=5c0b13f85ab3a5326508b854768eb70c8829cda4

Merge branch 'maint-1.9' into maint

* maint-1.9:
Documentation: fix missing text for rev-parse --verify
---

diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 987395d22a..54143a0693 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`