Merge branch 'maint-for-junio' of git://repo.or.cz/git/fastimport into maint
authorJunio C Hamano <junkio@cox.net>
Tue, 6 Mar 2007 01:07:17 +0000 (17:07 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 6 Mar 2007 01:07:17 +0000 (17:07 -0800)
commitc2d4eb7e04397595aa1369414aaab52f27bb9e3a
tree79438c1ce0674bafb0d06b767d12b8e423364d1b
parent56333bac66ccdefa3f6d67f78da9f5267119c4a6
parent2f6dc35d2ad0bd2a8648902a692f087f47d1ee86
Merge branch 'maint-for-junio' of git://repo.or.cz/git/fastimport into maint

* 'maint-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