From: Junio C Hamano <junkio@cox.net>
Date: Sun, 6 May 2007 07:21:03 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=125a5f1c2a93f217e92dd88210c2cb503032c02f;p=git.git

Merge branch 'maint'

* maint:
  Small correction in reading of commit headers
  Documentation: fix typo in git-remote.txt
  Add test for blame corner cases.
  blame: -C -C -C
  blame: Notice a wholesale incorporation of an existing file.
  Fix --boundary output
  diff format documentation: describe raw combined diff format
  Mention version 1.5.1 in tutorial and user-manual
  Add --no-rebase option to git-svn dcommit
  Fix markup in git-svn man page
---

125a5f1c2a93f217e92dd88210c2cb503032c02f