Merge branch 'dc/format-pretty'

* dc/format-pretty:
log/show/whatchanged: introduce format.pretty configuration
specify explicit "--pretty=medium" with `git log/show/whatchanged`
whatchanged documentation: share description of --pretty with others

diff --cc Documentation/config.txt
Simple merge