From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 1 Dec 2007 00:21:33 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.4-rc0~128
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=65c6a4696a760f518c9f262705de030323c11146;p=git.git

Merge branch 'maint'

* maint:
  Replace the word 'update-cache' by 'update-index' everywhere
  cvsimport: fix usage of cvsimport.module
  t7003-filter-branch: Fix test of a failing --msg-filter.
  cvsimport: miscellaneous packed-ref fixes
  cvsimport: use rev-parse to support packed refs
  Add basic cvsimport tests
---

65c6a4696a760f518c9f262705de030323c11146