aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-23 13:35:19 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-23 13:35:19 -0700
commit8d19426f985afdf4cc34f88198226964566dcdc1 (patch)
treeae682e1547907e8a8260bc9b4c365e28bb077795 /Documentation
parent12219414dd4b114081374361101ac2de65e0f1d7 (diff)
parentd0740ce0ba9417c34e00b5a61161d84f85ba7fbc (diff)
downloadgit-8d19426f985afdf4cc34f88198226964566dcdc1.tar.gz
git-8d19426f985afdf4cc34f88198226964566dcdc1.tar.xz
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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-rev-parse.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index f63b81aad..4cc3e9586 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -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