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

Merge branch 'maint-1.6.5' into maint-1.6.6

* maint-1.6.5:
  dwim_ref: fix dangling symref warning
  stash pop: remove 'apply' options during 'drop' invocation
  diff: make sure --output=/bad/path is caught
---

eb0bcd0fbe34befe7648a398efc7f4156b07da48