pretty: note that %cd respects the --date= option

diff --git a/git-stash.sh b/git-stash.sh
index fc3005a7a2453ebd37c7efee4a082e3655037603..4621d81fab472310e1183c1b9914644259a911e8 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -513,8 +513,14 @@ apply_stash () {
 pop_stash() {
        assert_stash_ref "$@"
 
-       apply_stash "$@" &&
-       drop_stash "$@"
+       if apply_stash "$@"
+       then
+               drop_stash "$@"
+       else
+               status=$?
+               say "The stash is kept in case you need it again."
+               exit $status
+       fi
 }
 
 drop_stash () {