Janek Warchoł writes:
> On Wed, Jul 4, 2012 at 4:00 PM, Graham Percival
> wrote:
>> On Wed, Jul 04, 2012 at 02:55:19PM +0100, Phil Holmes wrote:
>>> If you're not quite sure of the changes you want to make, can you
>>> get help with
>>>
>>> git reset --hard "HEAD@{10 minutes from now}
>>>
>>> ?
On Wed, Jul 4, 2012 at 4:00 PM, Graham Percival
wrote:
> On Wed, Jul 04, 2012 at 02:55:19PM +0100, Phil Holmes wrote:
>> If you're not quite sure of the changes you want to make, can you
>> get help with
>>
>> git reset --hard "HEAD@{10 minutes from now}
>>
>> ? :-)
>
> That only works on Janek's
On Wed, Jul 04, 2012 at 02:55:19PM +0100, Phil Holmes wrote:
> - Original Message - From: "David Kastrup"
> To:
> Sent: Wednesday, July 04, 2012 12:20 PM
> Subject: Re: Help with git rebase recovery, please
>
> >You already got one answer that is more app
- Original Message -
From: "David Kastrup"
To:
Sent: Wednesday, July 04, 2012 12:20 PM
Subject: Re: Help with git rebase recovery, please
"Trevor Daniels" writes:
I just made a mistake with git rebase and lost a branch I'd like to
recover, but I don&#x
"Trevor Daniels" writes:
> I just made a mistake with git rebase and lost a branch I'd like to
> recover, but I don't know how or even if it is possible.
>
> Here's what I did.
>
> I checked out branch A
> then entered
>
> git rebase master
>
> This gave merge conflicts, and the usual three optio
John Mandereau wrote Wednesday, July 04, 2012 10:57 AM
Subject: Re: Help with git rebase recovery, please
> Il giorno mer, 04/07/2012 alle 10.31 +0100, Trevor Daniels ha scritto:
>> So, can I now recover my original branch A?
>
> Look at what
>
> git reflog
>
> s
Il giorno mer, 04/07/2012 alle 10.31 +0100, Trevor Daniels ha scritto:
> I just made a mistake with git rebase and lost a branch I'd like to recover,
> but I don't know how or even if it is possible.
>
> Here's what I did.
>
> I checked out branch A
> then entered
>
> git rebase master
>
> Thi
I just made a mistake with git rebase and lost a branch I'd like to recover,
but I don't know how or even if it is possible.
Here's what I did.
I checked out branch A
then entered
git rebase master
This gave merge conflicts, and the usual three options.
I decided not to resolve the merge confl
