From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 24 Aug 2008 01:28:37 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~310
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d6096f17d2d5d9ccb453aabf8edc6ee238b166fc;p=git.git

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'
---

d6096f17d2d5d9ccb453aabf8edc6ee238b166fc