From: Junio C Hamano <junkio@cox.net>
Date: Tue, 6 Mar 2007 05:23:46 +0000 (-0800)
Subject: Merge branch 'master-for-junio' of git://repo.or.cz/git/fastimport; branch 'maint'
X-Git-Tag: v1.5.1-rc1~92
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=99e6ac503b175ef38ca98e88a6ec1e290ad79d69;p=git.git

Merge branch 'master-for-junio' of git://repo.or.cz/git/fastimport; branch 'maint'

* 'master-for-junio' of git://repo.or.cz/git/fastimport:
  fast-import: Fail if a non-existant commit is used for merge
  fast-import: Avoid infinite loop after reset

* maint:
  Fix diff-options references in git-diff and git-format-patch
  Add definition of <commit-ish> to the main git man page.
  Begin SubmittingPatches with a check list
  fast-import: Fail if a non-existant commit is used for merge
  fast-import: Avoid infinite loop after reset
---

99e6ac503b175ef38ca98e88a6ec1e290ad79d69