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

Re: Behavior of stash apply vs merge

From
Robin Rosenberg <robin.rosenberg@dewire.com>
Date
Jan 27, 2013, 19:51 UTC
Message-ID
<35452020.1815583.1359316269106.JavaMail.root@dewire.com>
In-Reply-To
<7vfw1mwibu.fsf@alter.siamese.dyndns.org>
----- Ursprungligt meddelande -----
Show 11 quoted lines
> Robin Rosenberg <robin.rosenberg@dewire.com> writes:
> 
> > Thanks. Feeling a bit studid now.
> >
> > I was actually thinking about using merge to implement stash apply
> > in JGit. What we have is broken so I tried using merge to implement
> > it and them compared to git merge --no-commit.. FAIL.
> 
> Do you have "cherry-pick"?
>
> In short, "stash apply" is a "cherry-pick" in disguise.

Yes, that's what I did. Thanks for confirming this. One for the working tree and if that succeeds I do another one to restore the index if requested.

-- robin
Previous: Junio C Hamano
Message 5 of 5 in “Behavior of stash apply vs merge”
  1. Robin RosenbergJan 27, 2013
  2. Junio C HamanoJan 27, 2013
  3. Robin RosenbergJan 27, 2013
  4. Junio C HamanoJan 27, 2013
  5. Robin RosenbergJan 27, 2013

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.