Merge branch 'lt/dirwalk' into jc/dirwalk-n-cache-tree
authorJunio C Hamano <junkio@cox.net>
Sat, 20 May 2006 08:28:49 +0000 (01:28 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 20 May 2006 08:52:19 +0000 (01:52 -0700)
commit93872e07008510340eec951f0d037f7b3a0b8567
treece5b2c6456000dd5e8dde7b479c2ad6784966055
parent283c8eef6c9a4e379c73904d2bc22b19341b15c8
parentd9b814cc97f16daac06566a5340121c446136d22
Merge branch 'lt/dirwalk' into jc/dirwalk-n-cache-tree

This commit is what this branch is all about.  It records the
evil merge needed to adjust built-in git-add and git-rm for
the cache-tree extension.

* lt/dirwalk:
  Add builtin "git rm" command
  Move pathspec matching from builtin-add.c into dir.c
  Prevent bogus paths from being added to the index.
  builtin-add: fix unmatched pathspec warnings.
  Remove old "git-add.sh" remnants
  builtin-add: warn on unmatched pathspecs
  Do "git add" as a builtin
  Clean up git-ls-file directory walking library interface
  libify git-ls-files directory traversal

Conflicts:

Makefile
builtin.h
git.c
update-index.c
Makefile
builtin-add.c
builtin-rm.c
builtin.h
cache.h
git.c
read-cache.c
update-index.c