From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Mar 2014 19:48:51 +0000 (-0700)
Subject: Merge branch 'jc/stash-pop-not-popped'
X-Git-Tag: v2.0.0-rc0~78
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10bdb20d6a6841b22a3327e3e0fbdd6b5521eb96;p=thirdparty%2Fgit.git

Merge branch 'jc/stash-pop-not-popped'

"stash pop", upon failing to apply the stash, refrains from
discarding the stash to avoid information loss.  Be more explicit
in the error message.

The wording may want to get a bit more bikeshedding.

* jc/stash-pop-not-popped:
  stash pop: mention we did not drop the stash upon failing to apply
---

10bdb20d6a6841b22a3327e3e0fbdd6b5521eb96