git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ed Avis <eda@waniasset.com>
To: git@vger.kernel.org
Subject: Re: Feature: git stash pop --always-drop
Date: Mon, 10 Aug 2015 14:01:23 +0000 (UTC)	[thread overview]
Message-ID: <loom.20150810T155117-978@post.gmane.org> (raw)
In-Reply-To: 20150810134957.GC6763@sigill.intra.peff.net

>
Yes, my use case is that I get confused about whether the stash has been
dropped or not and whether I might have stashed something else in the
meantime.  So for me plain 'git stash drop' feels a bit dangerous.

Jeff King <peff <at> peff.net> writes:

>I also wondered if the "dropped" message is
>sufficiently clear to new users. The point of it, I think, is to allow a
>final "oops, I didn't mean to do that" moment. But there are no
>instructions for how one would re-create the same stash.

Right - myself I didn't even realize that recreating the stash was possible
(though I was vaguely aware that old stashes float around somewhere until
they are garbage collected many months later).

git stash is a relatively infrequent operation and quite exotic, so it
wouldn't hurt to add lots of chatter to it.

>>Another feature I would like to see is a kind of atomic stash apply, 

>I think that may be a bit harder, as the merge machinery would have to
>know how to be atomic.

If git merge-recursive had a --dry-run flag that might take care of it.

-- 
Ed Avis <eda@waniasset.com>

  reply	other threads:[~2015-08-10 14:01 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-10 10:42 Feature: git stash pop --always-drop Ed Avis
2015-08-10 12:41 ` Jeff King
2015-08-10 12:50   ` Ed Avis
2015-08-10 13:32     ` Jeff King
2015-08-10 13:43       ` Ed Avis
2015-08-10 13:49         ` Jeff King
2015-08-10 14:01           ` Ed Avis [this message]
2015-08-10 15:08             ` Junio C Hamano
2015-08-10 15:16               ` Ed Avis

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=loom.20150810T155117-978@post.gmane.org \
    --to=eda@waniasset.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).