From: Junio C Hamano <junkio@cox.net>
Date: Tue, 7 Mar 2006 04:58:41 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.3.0-rc1~42
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e4a0e2aac0e667a3a9b4449c5be4e084c4a9c44e;p=git-core%2Fgit.git

Merge branch 'master' into next

* master:
  Merge branch 'sp/checkout'
  Merge branch 'fd/asciidoc'
  Allow format-patch to attach patches
  Allow adding arbitary lines in the mail header generated by format-patch.
---

e4a0e2aac0e667a3a9b4449c5be4e084c4a9c44e