Merge branch 'mg/format-ref-doc-fix' into maint

Doc fix.

* mg/format-ref-doc-fix:
Documentation/git-for-each-ref: clarify peeling of tags for --format
Documentation: use proper wording for ref format strings

diff --cc Documentation/git-for-each-ref.txt
Simple merge

diff --cc Documentation/git-tag.txt
Simple merge