Merge branch 'jc/cachetree' into cr/reset
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Sep 2007 08:19:30 +0000 (01:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Sep 2007 08:19:30 +0000 (01:19 -0700)
* jc/cachetree:
Simplify cache API
git-format-patch --in-reply-to: accept <message@id> with angle brackets
git-add -u: do not barf on type changes
Remove duplicate note about removing commits with git-filter-branch
git-clone: improve error message if curl program is missing or not executable
git.el: Allow the add and remove commands to be applied to ignored files.
git.el: Allow selecting whether to display uptodate/unknown/ignored files.
git.el: Keep the status buffer sorted by filename.
hooks--update: Explicitly check for all zeros for a deleted ref.

1  2 
read-cache.c
diff --cc read-cache.c
Simple merge