Merge branch 'mm/log-format-raw-doc'
commitabcbafedbfbd5994ad604bab141c0ba18f5a19df
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Jun 2015 19:45:17 +0000 (1 12:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Jun 2015 19:45:18 +0000 (1 12:45 -0700)
tree49b3dda778d5df9f024013c8480f9b4ba0f3db50
parent67f0b6f3b2226ea858c616028375dcc3c46ccc37
parent92de92172d1c01f3029d592f7e0f15d52149200b
Merge branch 'mm/log-format-raw-doc'

Clarify that "log --raw" and "log --format=raw" are unrelated
concepts.

* mm/log-format-raw-doc:
  Documentation/log: clarify sha1 non-abbreviation in log --raw
  Documentation/log: clarify what --raw means
Documentation/diff-options.txt
Documentation/pretty-formats.txt