Sync with maint

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

diff --combined Documentation/git-rev-parse.txt
index 9bd76a5a6b9327136871dd49cdad5c1ecd8dbcde,54143a0693da895035187a04f58f59cf92105fa2..0b84769bd91b5894a246ff3d499dca1ffba339ac
--- 1/Documentation/git-rev-parse.txt
--- 2/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
  ~~~~~~~~~~~~~