From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Jul 2014 18:00:23 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v2.1.0-rc0~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/247b4d5f3807dc3c2230bb4bf497f84a1fc59e49?ds=inline;hp=-c

Sync with maint

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

247b4d5f3807dc3c2230bb4bf497f84a1fc59e49
diff --combined Documentation/git-rev-parse.txt
index 9bd76a5a6b,54143a0693..0b84769bd9
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@@ -102,7 -102,7 +102,7 @@@ eval "set -- $(git rev-parse --sq --pre
  +
  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`
@@@ -245,10 -245,6 +245,10 @@@ print a message to stderr and exit wit
  --show-toplevel::
  	Show the absolute path of the top-level directory.
  
 +--shared-index-path::
 +	Show the path to the shared index file in split index mode, or
 +	empty if not in split-index mode.
 +
  Other Options
  ~~~~~~~~~~~~~