From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Feb 2010 06:40:45 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.1-rc0~154
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=72cd63c008c673e185740a694cdf3e85711df3d2;p=git.git

Merge branch 'maint'

* maint:
  Prepare 1.7.0.1 release notes
  Fix use of mutex in threaded grep
  dwim_ref: fix dangling symref warning
  stash pop: remove 'apply' options during 'drop' invocation
  diff: make sure --output=/bad/path is caught
  Remove hyphen from "git-command" in two error messages
---

72cd63c008c673e185740a694cdf3e85711df3d2