From: John Tapsell <johnflux@gmail.com>
Date: Fri, 20 Feb 2009 04:47:39 GMT
Subject: Re: git merge --abort
Message-ID: <43d8ce650902192047g383a5cc1re6697e8009ad72fc@mail.gmail.com>
In-Reply-To: <76718490902191226k7b87f478p9a79b9b2372b464d@mail.gmail.com>

2009/2/19 Jay Soffian <jaysoffian@gmail.com>:
> On Thu, Feb 19, 2009 at 8:34 AM, John Tapsell <johnflux@gmail.com> wrote:
>> There's no reliable way of getting back to the state before the merge?
>
> Sure there is. Commit or stash before you merge, so that your index
> and working copy are clean.

Could a stash be done automatically by the merge command, for just a case?

John