Merge branch 'nd/pretty-commit-log-message'
commitc17f1a9117916499a2153c7386ad3124e0b14ed0
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 22:20:03 +0000 (1 15:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 22:20:03 +0000 (1 15:20 -0700)
treeeff7f76ca9230419f5325a91221f5570b672de67
parent0e7e30f5606b48a4c6d34bc99c6d680bb76d3fbc
parent1d5bd615c0d8dadfa9dee0511b3ba3feaf838877
Merge branch 'nd/pretty-commit-log-message'

* nd/pretty-commit-log-message:
  pretty.c: use original commit message if reencoding fails
  pretty.c: free get_header() return value
pretty.c