Merge branch 'jc/stash-pop-not-popped'
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Mar 2014 19:48:51 +0000 (12:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Mar 2014 19:48:51 +0000 (12:48 -0700)
"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

1  2 
git-stash.sh
diff --cc git-stash.sh
Simple merge