Merge branch 'dc/format-pretty'
authorJunio C Hamano <gitster@pobox.com>
Sat, 8 Mar 2008 06:33:26 +0000 (22:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 8 Mar 2008 06:33:26 +0000 (22:33 -0800)
* 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

1  2 
Documentation/config.txt

Simple merge