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

gitster · gitster · commit 8d19426f985a · 2012-05-23T13:35:19.000-07:00
By Jon Seymour
* js/rev-parse-doc-fix:
  rev-parse doc: --git-dir does not always show a relative path
diff --git 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

Original file line number	Diff line number	Diff line change
@@ -137,7 +137,8 @@ shown. If the pattern does not contain a globbing character (`?`,
`137`	`137`
`138`	`138`	`--git-dir::`
`139`	`139`	Show `$GIT_DIR` if defined. Otherwise show the path to
`140`		`- the .git directory, relative to the current directory.`
	`140`	`+ the .git directory. The path shown, when relative, is`
	`141`	`+ relative to the current working directory.`
`141`	`142`	`+`
`142`	`143`	If `$GIT_DIR` is not defined and the current directory
`143`	`144`	`is not detected to lie in a git repository or work tree`