Andrew's git / gitweb.git / diff
?
Merge branch 'ml/cvsimport'
authorJunio C Hamano <junkio@cox.net>
Mon, 26 Jun 2006 21:35:33 +0000 (14:35 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 26 Jun 2006 21:35:33 +0000 (14:35 -0700)
* ml/cvsimport:
cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}
cvsimport: setup indexes correctly for ancestors and incremental imports

Trivial merge