From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Feb 2010 23:05:02 +0000 (-0800)
Subject: Merge branch 'maint-1.6.6' into maint
X-Git-Tag: v1.7.0.1~21
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e7b3cea0f7589c57f7bb808330e32bdd7f901c95;p=git.git

Merge branch 'maint-1.6.6' into maint

* maint-1.6.6:
  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
---

e7b3cea0f7589c57f7bb808330e32bdd7f901c95