| commit | 10bdb20d6a6841b22a3327e3e0fbdd6b5521eb96 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 Mar 2014 19:48:51 +0000 (21 12:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 Mar 2014 19:48:51 +0000 (21 12:48 -0700) | ||
| tree | c9bfae45a7a43b6520339c3a421d0994b58dc00a | treesnapshot (tar.gz zip) |
| parent | 1be645c0b1b2218d58fbae9dd6174ff2a9d66d57 | commitdiff |
| parent | 2d4c99339210d43a84841a71a50e88a050d9e21b | commitdiff |
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
"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 | blobhistory |