Merge branch 'maint'

* maint:
  Do not talk about "diff" in rev-list documentation.

diff --cc Documentation/rev-list-options.txt
Simple merge