From: Marc Branchaud <marcnarc@xiplink.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Stephan Beyer <s-beyer@gmx.net>
Cc: git <git@vger.kernel.org>
Subject: Re: [RFC] stash --continue
Date: Wed, 18 Jan 2017 10:41:00 -0500 [thread overview]
Message-ID: <d5456165-bdf2-e9e7-117f-aeab0ff4b417@xiplink.com> (raw)
In-Reply-To: <alpine.DEB.2.20.1701161153340.3469@virtualbox>
On 2017-01-16 05:54 AM, Johannes Schindelin wrote:
> Hi Stephan,
>
> On Mon, 16 Jan 2017, Stephan Beyer wrote:
>
>> a git-newbie-ish co-worker uses git-stash sometimes. Last time he used
>> "git stash pop", he got into a merge conflict. After he resolved the
>> conflict, he did not know what to do to get the repository into the
>> wanted state. In his case, it was only "git add <resolved files>"
>> followed by a "git reset" and a "git stash drop", but there may be more
>> involved cases when your index is not clean before "git stash pop" and
>> you want to have your index as before.
>>
>> This led to the idea to have something like "git stash --continue"[1]
>
> More like "git stash pop --continue". Without the "pop" command, it does
> not make too much sense.
Why not? git should be able to remember what stash command created the
conflict. Why should I have to? Maybe the fire alarm goes off right
when I run the stash command, and by the time I get back to it I can't
remember which operation I did. It would be nice to be able to tell git
to "just finish off (or abort) the stash operation, whatever it was".
M.
next prev parent reply other threads:[~2017-01-18 15:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-15 23:56 [RFC] stash --continue Stephan Beyer
2017-01-16 3:59 ` Jacob Keller
2017-01-16 10:54 ` Johannes Schindelin
2017-01-18 15:41 ` Marc Branchaud [this message]
2017-01-18 16:34 ` Johannes Schindelin
2017-01-18 18:44 ` Marc Branchaud
2017-01-18 19:35 ` Samuel Lijin
2017-01-19 15:49 ` Johannes Schindelin
2017-01-19 18:38 ` Marc Branchaud
2017-01-19 21:30 ` Johannes Schindelin
2017-01-20 15:19 ` Marc Branchaud
2017-01-20 15:27 ` Johannes Schindelin
2017-01-18 19:10 ` Junio C Hamano
2017-01-18 19:20 ` Stephan Beyer
2017-01-19 15:54 ` Johannes Schindelin
2017-01-17 20:21 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d5456165-bdf2-e9e7-117f-aeab0ff4b417@xiplink.com \
--to=marcnarc@xiplink.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=s-beyer@gmx.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).