From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 27 Jan 2013 19:12:53 GMT
Subject: Re: Behavior of stash apply vs merge
Message-ID: <7vfw1mwibu.fsf@alter.siamese.dyndns.org>
In-Reply-To: <2043716001.1806075.1359313796808.JavaMail.root@dewire.com>

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.