Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 23 May 2006 08:26:34 +0000 (01:26 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 23 May 2006 08:26:34 +0000 (01:26 -0700)
* master:
Add git-quiltimport to .gitignore.
cvsimport: introduce _fetchfile() method and used a 1M buffer to read()
cvsimport: cleanup commit function
cvsimport: use git-update-index --index-info
git status: skip empty directories, and add -u to show all untracked files
cvsimport: repack every kilo-commits.
cvsimport: introduce -L<imit> option to workaround memory leaks

1  2 
.gitignore
diff --cc .gitignore
Simple merge