Merge branch 'maint'
commit267123b4299ea2c2f090ef169f9fc5039897cd72
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Mar 2008 07:09:20 +0000 (15 00:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Mar 2008 07:09:33 +0000 (15 00:09 -0700)
treeecbbe5be7cfd059b001af3195d71a0b9cece8c30
parent2a2ad0c0007b9f79768b4564644ac9eaaa7310b6
parent6bf4f1b4c9d78b2061bd5f3bf77bb21112b755be
Merge branch 'maint'

* maint:
  format-patch: generate MIME header as needed even when there is format.header
builtin-log.c
commit.h
log-tree.c
log-tree.h
pretty.c