From: Robin Rosenberg <robin.rosenberg@dewire.com>
Date: Sun, 27 Jan 2013 19:09:56 GMT
Subject: Re: Behavior of stash apply vs merge
Message-ID: <2043716001.1806075.1359313796808.JavaMail.root@dewire.com>
In-Reply-To: <7vvcaiwltj.fsf@alter.siamese.dyndns.org>

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.

The main difference is of course that I set the merge base to
stash^1, which is obviously not what my question was about.

-- robin