Merge branch 'rj/doc-rev-parse'

* rj/doc-rev-parse:
  rev-parse(1): logically group options
  rev-parse: remove restrictions on some options

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

diff --cc builtin/rev-parse.c
Simple merge