Re: `git stash pop` UX Problem
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 25, 2014, 22:23 UTC
- Message-ID
- <xmqqvbw24yt3.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <85mwhe52zp.fsf@stephe-leake.org>
Stephen Leake <stephen_leake@stephe-leake.org> writes:
Show 5 quoted lines
>> Dropping the stash on a "git add" operation would be really, really >> weird... > > Why? That is when the merge conflicts are resolved, which is what > logically indicates that the stash is no longer needed,...
Not necessarily. Imagine a case where you used stash to quickly save away a tangled mess that was not ready for a logically single commit and now you are in the process of creating the first commit by applying it piece-by-piece to create multiple resulting ones. After you commit the result, you would still want to keep the parts of that stashed change you did not include in the first commit so that you can go back, no?
You may run "git add", but that does not say anything about what you are going to use the rest of the stash for. Not even "git commit" may be a good enough sign.