From: Junio C Hamano <junkio@cox.net>
Date: Mon, 27 Feb 2006 23:54:36 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.3.0-rc1~54^2~24
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=6d5e6fff52968443018af56e2966cf5866130a4e;p=git.git

Merge branch 'master' into next

* master:
  Merge part of kh/svnimport branch into master
  contrib/git-svn: correct commit example in manpage
  contrib/git-svn: tell the user to not modify git-svn-HEAD directly
  gitview: Remove trailing white space
  gitview: Fix the encoding related bug
  git-format-patch: Always add a blank line between headers and body.
  combine-diff: Honour -z option correctly.
  combine-diff: Honour --full-index.
---

6d5e6fff52968443018af56e2966cf5866130a4e