projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56333ba 2f6dc35)
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)
* '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


Trivial merge
Git—the stupid content tracker