From: Junio C Hamano <junkio@cox.net>
Date: Tue, 23 May 2006 08:26:34 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1~71
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=646881a15612c0039af1a4307e3981fd48931326;p=git.git

Merge branch 'master' into next

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

646881a15612c0039af1a4307e3981fd48931326