diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-21 12:48:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-21 12:48:51 -0700 |
| commit | 10bdb20d6a6841b22a3327e3e0fbdd6b5521eb96 (patch) | |
| tree | c9bfae45a7a43b6520339c3a421d0994b58dc00a /parse-options.c | |
| parent | Merge branch 'dk/skip-prefix-scan-only-once' (diff) | |
| parent | stash pop: mention we did not drop the stash upon failing to apply (diff) | |
| download | tgif-10bdb20d6a6841b22a3327e3e0fbdd6b5521eb96.tar.xz | |
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
Diffstat (limited to 'parse-options.c')
0 files changed, 0 insertions, 0 deletions