tree adfe643504e7bfa6b3bdaf47b9ff5df3d5ba7349
parent cc0e6c5adc783bcb29954f3a0b7a6197bcc9b1b3
parent e102d4353d7cfd69a597cd976eabdcb74641be69
author Junio C Hamano <junkio@cox.net> 1178436063 -0700
committer Junio C Hamano <junkio@cox.net> 1178436063 -0700

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