From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Sep 2007 08:19:30 +0000 (-0700)
Subject: Merge branch 'jc/cachetree' into cr/reset
X-Git-Tag: v1.5.4-rc0~434^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=58f6fb53dd1104559f6f5507562a975c0ff079af;p=git.git

Merge branch 'jc/cachetree' into cr/reset

* 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.
---

58f6fb53dd1104559f6f5507562a975c0ff079af