From: Robin Rosenberg <robin.rosenberg@dewire.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: Behavior of stash apply vs merge
Date: Sun, 27 Jan 2013 20:51:09 +0100 (CET) [thread overview]
Message-ID: <35452020.1815583.1359316269106.JavaMail.root@dewire.com> (raw)
In-Reply-To: <7vfw1mwibu.fsf@alter.siamese.dyndns.org>
----- Ursprungligt meddelande -----
> 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
prev parent reply other threads:[~2013-01-27 19:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1192924141.1697155.1359285809347.JavaMail.root@dewire.com>
2013-01-27 11:35 ` Behavior of stash apply vs merge Robin Rosenberg
2013-01-27 17:57 ` Junio C Hamano
2013-01-27 19:09 ` Robin Rosenberg
2013-01-27 19:12 ` Junio C Hamano
2013-01-27 19:51 ` Robin Rosenberg [this message]
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=35452020.1815583.1359316269106.JavaMail.root@dewire.com \
--to=robin.rosenberg@dewire.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).