Merge branch 'sb/rev-parse-show-superproject-root'

Doc markup fix.

* sb/rev-parse-show-superproject-root:
docs: fix formatting of rev-parse's --show-superproject-working-tree

diff --combined Documentation/git-rev-parse.txt
index 0917b8207b9d6e6c88dc611cf40a81ab17481a2e,280fe75944e89c0c46665cfea88865c8da63781e..95326b85ff68edbda3a6661816251351029bdfda
--- 1/Documentation/git-rev-parse.txt
--- 2/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@@ -126,12 -126,6 +126,12 @@@ can be used
        'git diff-{asterisk}'). In contrast to the `--sq-quote` option,
        the command input is still interpreted as usual.
  
 +--short[=length]::
 +      Same as `--verify` but shortens the object name to a unique
 +      prefix with at least `length` characters. The minimum length
 +      is 4, the default is the effective value of the `core.abbrev`
 +      configuration variable (see linkgit:git-config[1]).
 +
  --not::
        When showing object names, prefix them with '{caret}' and
        strip '{caret}' prefix from the object names that already have
@@@ -142,6 -136,12 +142,6 @@@
        The option core.warnAmbiguousRefs is used to select the strict
        abbreviation mode.
  
 ---short::
 ---short=number::
 -      Instead of outputting the full SHA-1 values of object names try to
 -      abbreviate them to a shorter unique name. When no length is specified
 -      7 is used. The minimum length is 4.
 -
  --symbolic::
        Usually the object names are output in SHA-1 form (with
        possible '{caret}' prefix); this option makes them output in a
@@@ -235,9 -235,6 +235,9 @@@ print a message to stderr and exit wit
  --is-bare-repository::
        When the repository is bare print "true", otherwise "false".
  
 +--is-shallow-repository::
 +      When the repository is shallow print "true", otherwise "false".
 +
  --resolve-git-dir <path>::
        Check if <path> is a valid repository or a gitfile that
        points at a valid repository, and print the location of the
@@@ -264,7 -261,7 +264,7 @@@
  --show-toplevel::
        Show the absolute path of the top-level directory.
  
- --show-superproject-working-tree
+ --show-superproject-working-tree::
        Show the absolute path of the root of the superproject's
        working tree (if exists) that uses the current repository as
        its submodule.  Outputs nothing if the current repository is