From: Junio C Hamano <junkio@cox.net>
Date: Mon, 29 May 2006 05:34:34 +0000 (-0700)
Subject: Merge branch 'jc/dirwalk-n-cache-tree' into jc/cache-tree
X-Git-Tag: v1.4.0-rc1~45^2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=7d55561986ffe94ca7ca22dc0a6846f698893226;p=git.git

Merge branch 'jc/dirwalk-n-cache-tree' into jc/cache-tree

* jc/dirwalk-n-cache-tree: (212 commits)
  builtin-rm: squelch compiler warnings.
  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
  Add a conversion tool to migrate remote information into the config
  fetch, pull: ask config for remote information
  Fix build procedure for builtin-init-db
  read-tree -m -u: do not overwrite or remove untracked working tree files.
  apply --cached: do not check newly added file in the working tree
  Implement a --dry-run option to git-quiltimport
  Implement git-quiltimport
  Revert "builtin-grep: workaround for non GNU grep."
  builtin-grep: workaround for non GNU grep.
  builtin-grep: workaround for non GNU grep.
  ...
---

7d55561986ffe94ca7ca22dc0a6846f698893226