Merge branch 'maint'

* maint:
  Fix grammar in git-rev-parse(1).

diff --cc Documentation/git-rev-parse.txt
Simple merge