Merge branch 'maint'
commitd6096f17d2d5d9ccb453aabf8edc6ee238b166fc
authorJunio C Hamano <gitster@pobox.com>
Sun, 24 Aug 2008 01:28:37 +0000 (23 18:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Aug 2008 01:28:37 +0000 (23 18:28 -0700)
tree0699a406f367814d799817402044b89c44491d97
parenta7b3269c4b9acde052d75b6dc54c8f869b77eb44
parent913e0e99b6a6e63af6a062622a1f94bd78fd8052
Merge branch 'maint'

* maint:
  unpack_trees(): protect the handcrafted in-core index from read_cache()
  git-p4: Fix one-liner in p4_write_pipe function.
  Completion: add missing '=' for 'diff --diff-filter'
  Fix 'git help help'
cache.h
read-cache.c