Merge branch 'js/rev-parse-doc-fix'

By Jon Seymour
* js/rev-parse-doc-fix:
rev-parse doc: --git-dir does not always show a relative path

diff --combined Documentation/git-rev-parse.txt
index f63b81aad6dd8d0fc7de0c6d9dac5f8e8dc65d6a,00e73c84c7c041bc06ad640d442557bb600f7b53..4cc3e9586fcfd79ddeb7f636141e1a878285b0b5
--- 1/Documentation/git-rev-parse.txt
--- 2/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@@ -8,7 -8,6 +8,7 @@@ git-rev-parse - Pick out and massage pa
  
  SYNOPSIS
  --------
 +[verse]
  'git rev-parse' [ --option ] <args>...
  
  DESCRIPTION
@@@ -113,14 -112,15 +113,14 @@@ OPTION
  +
  If a `pattern` is given, only refs matching the given shell glob are
  shown.  If the pattern does not contain a globbing character (`?`,
 -`{asterisk}`, or `[`), it is turned into a prefix match by
 -appending `/{asterisk}`.
 +`*`, or `[`), it is turned into a prefix match by appending `/*`.
  
  --glob=pattern::
        Show all refs matching the shell glob pattern `pattern`. If
        the pattern does not start with `refs/`, this is automatically
        prepended.  If the pattern does not contain a globbing
 -      character (`?`, `{asterisk}`, or `[`), it is turned into a prefix
 -      match by appending `/{asterisk}`.
 +      character (`?`, `*`, or `[`), it is turned into a prefix
 +      match by appending `/*`.
  
  --show-toplevel::
        Show the absolute path of the top-level directory.
@@@ -137,7 -137,8 +137,8 @@@
  
  --git-dir::
        Show `$GIT_DIR` if defined. Otherwise show the path to
-       the .git directory, relative to the current directory.
+       the .git directory. The path shown, when relative, is
+       relative to the current working directory.
  +
  If `$GIT_DIR` is not defined and the current directory
  is not detected to lie in a git repository or work tree
@@@ -179,10 -180,6 +180,10 @@@ print a message to stderr and exit wit
  <args>...::
        Flags and parameters to be parsed.
  
 +--resolve-git-dir <path>::
 +      Check if <path> is a valid git-dir or a git-file pointing to a valid
 +      git-dir. If <path> is a valid git-dir the resolved path to git-dir will
 +      be printed.
  
  include::revisions.txt[]
  
@@@ -312,6 -309,16 +313,6 @@@ $ git rev-parse --default master --veri
  +
  but if $REV is empty, the commit object name from master will be printed.
  
 -
 -Author
 -------
 -Written by Linus Torvalds <torvalds@osdl.org> .
 -Junio C Hamano <gitster@pobox.com> and Pierre Habouzit <madcoder@debian.org>
 -
 -Documentation
 ---------------
 -Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 -
  GIT
  ---
  Part of the linkgit:git[1] suite