Code

Merge branch 'jc/pretty-lf'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Nov 2009 22:44:22 +0000 (14:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Nov 2009 22:44:22 +0000 (14:44 -0800)
commit684d0d8dcfa2288744a553fc7294c5f9f5c12026
treed790223199de25afa95aeb898d1b85d1e1dd3e1c
parent261fbda903762b9c47e4138312673ea25555d9e5
parent9fa708dab1ccf8be69a606ca4eb58e62f3ef334a
Merge branch 'jc/pretty-lf'

Conflicts:
pretty.c
t/t6006-rev-list-format.sh
Documentation/pretty-formats.txt
pretty.c
t/t6006-rev-list-format.sh