Merge branch 'mm/log-format-raw-doc' into next
commit97e2c9d8028885814766e26cbe4cec1aa4f599c7
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 21:20:44 +0000 (26 14:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 21:20:45 +0000 (26 14:20 -0700)
tree3a4dc6b7c95cf45a2a64c4fbfa5daa944388d525
parent7ae52d44e4ada901dc6dc578a895edf17114a51e
parent92de92172d1c01f3029d592f7e0f15d52149200b
Merge branch 'mm/log-format-raw-doc' into next

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