git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1be645c 2d4c993)
Merge branch 'jc/stash-pop-not-popped'
authorJunio C Hamano <redacted>
Fri, 21 Mar 2014 19:48:51 +0000 (12:48 -0700)
committerJunio C Hamano <redacted>
Fri, 21 Mar 2014 19:48:51 +0000 (12:48 -0700)
commit10bdb20d6a6841b22a3327e3e0fbdd6b5521eb96
treec9bfae45a7a43b6520339c3a421d0994b58dc00atree | snapshot
parent1be645c0b1b2218d58fbae9dd6174ff2a9d66d57commit | diff
parent2d4c99339210d43a84841a71a50e88a050d9e21bcommit | diff
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
git-stash.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT