Merge branch 'maint-1.9' into maint

* maint-1.9:
  Documentation: fix missing text for rev-parse --verify
This commit is contained in:
Junio C Hamano 2014-07-22 10:17:34 -07:00
commit bba6acb335

View File

@ -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 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 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` 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 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` annotated tag that points at a commit). To make sure that `$VAR`