Merge branch 'mm/log-format-raw-doc' into maint
commit4be33f7222990c1c761cd1c497c0db88b3d376cc
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:33:42 +0000 (16 14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:33:43 +0000 (16 14:33 -0700)
treec9d77a872a7484b13fa825e47ec7ca0029872190
parent335f1a7eb2a08218301deae92244591a0ee9710c
parent92de92172d1c01f3029d592f7e0f15d52149200b
Merge branch 'mm/log-format-raw-doc' into maint

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