Code

Merge branch 'nd/pretty-commit-log-message'
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 22:20:03 +0000 (15:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 22:20:03 +0000 (15:20 -0700)
* nd/pretty-commit-log-message:
  pretty.c: use original commit message if reencoding fails
  pretty.c: free get_header() return value

1  2 
pretty.c

diff --cc pretty.c
Simple merge