git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [RFC] stash --continue

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jan 16, 2017, 10:54 UTC
Message-ID
<alpine.DEB.2.20.1701161153340.3469@virtualbox>
In-Reply-To
<cd784a4e-ee99-564e-81de-9f7f6cc26c67@gmx.net>
Hi Stephan,
On Mon, 16 Jan 2017, Stephan Beyer wrote:
Show 9 quoted lines
> 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.

Ciao, Johannes

Previous: Jacob KellerNext: Marc Branchaud
Message 3 of 16 in “[RFC] stash --continue”
  1. Stephan BeyerJan 15, 2017
  2. Jacob KellerJan 16, 2017
  3. Johannes SchindelinJan 16, 2017
  4. Marc BranchaudJan 18, 2017
  5. Johannes SchindelinJan 18, 2017
  6. Marc BranchaudJan 18, 2017
  7. Samuel LijinJan 18, 2017
  8. Johannes SchindelinJan 19, 2017
  9. Marc BranchaudJan 19, 2017
  10. Johannes SchindelinJan 19, 2017
  11. Marc BranchaudJan 20, 2017
  12. Johannes SchindelinJan 20, 2017
  13. Junio C HamanoJan 18, 2017
  14. Stephan BeyerJan 18, 2017
  15. Johannes SchindelinJan 19, 2017
  16. Junio C HamanoJan 17, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.