Merge branch 'maint-1.8.5' into maint-1.9

gitster · gitster · commit d31f3ad23dd1 · 2014-07-22T10:16:50.000-07:00
* maint-1.8.5:
  Documentation: fix missing text for rev-parse --verify
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
@@ -102,7 +102,7 @@ eval "set -- $(git rev-parse --sq --prefix "$prefix" "$@")"
 +
 If you want to make sure that the output actually names an object in
 your object database and/or can be used as a specific type of object
-you require, you can add "^{type}" peeling operator to the parameter.
+you require, you can add "\^{type}" peeling operator to the parameter.
 For example, `git rev-parse "$VAR^{commit}"` will make sure `$VAR`
 names an existing object that is a commit-ish (i.e. a commit, or an
 annotated tag that points at a commit).  To make sure that `$VAR`

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ eval "set -- $(git rev-parse --sq --prefix "$prefix" "$@")"`
`102`	`102`	`+`
`103`	`103`	`If you want to make sure that the output actually names an object in`
`104`	`104`	`your object database and/or can be used as a specific type of object`
`105`		`-you require, you can add "^{type}" peeling operator to the parameter.`
	`105`	`+you require, you can add "\^{type}" peeling operator to the parameter.`
`106`	`106`	For example, `git rev-parse "$VAR^{commit}"` will make sure `$VAR`
`107`	`107`	`names an existing object that is a commit-ish (i.e. a commit, or an`
`108`	`108`	annotated tag that points at a commit). To make sure that `$VAR`