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
This commit is contained in:
Junio C Hamano 2012-05-23 13:35:19 -07:00
commit 8d19426f98

View File

@ -137,7 +137,8 @@ shown. If the pattern does not contain a globbing character (`?`,
--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