diff options
author | Junio C Hamano <junkio@cox.net> | 2006-05-20 12:28:49 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-05-20 12:52:19 +0400 |
commit | 93872e07008510340eec951f0d037f7b3a0b8567 (patch) | |
tree | ce5b2c6456000dd5e8dde7b479c2ad6784966055 /apply.c | |
parent | 283c8eef6c9a4e379c73904d2bc22b19341b15c8 (diff) | |
parent | d9b814cc97f16daac06566a5340121c446136d22 (diff) |
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
Diffstat (limited to 'apply.c')
0 files changed, 0 insertions, 0 deletions