Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 1 Dec 2007 00:21:33 +0000 (16:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 1 Dec 2007 00:21:33 +0000 (16:21 -0800)
* 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

1  2 
Documentation/user-manual.txt
Makefile
configure.ac
git-cvsimport.perl

Simple merge
diff --cc Makefile
Simple merge
diff --cc configure.ac
Simple merge
Simple merge