From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 May 2011 19:19:11 +0000 (-0700)
Subject: Merge branch 'jk/format-patch-am'
X-Git-Tag: v1.7.6-rc0~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f67d2e82d6d2fd385d3d20e8d348eaf69dc95041?hp=f67d2e82d6d2fd385d3d20e8d348eaf69dc95041

Merge branch 'jk/format-patch-am'

* jk/format-patch-am:
format-patch: preserve subject newlines with -k
clean up calling conventions for pretty.c functions
pretty: add pp_commit_easy function for simple callers
mailinfo: always clean up rfc822 header folding
t: test subject handling in format-patch / am pipeline

Conflicts:
builtin/branch.c
builtin/log.c
commit.h
---