From: Wincent Colaiuta <win@wincent.com>
Date: Fri, 14 Mar 2008 11:17:05 GMT
Subject: Re: About detached heads
Message-ID: <E1DAC955-38CC-495B-9DCA-B25847EFF6C4@wincent.com>
In-Reply-To: <vpq1w6dvaxe.fsf@bauges.imag.fr>

El 14/3/2008, a las 11:48, Matthieu Moy escribió:

> Wincent Colaiuta <win@wincent.com> writes:
>
>> El 14/3/2008, a las 10:46, Geoff Russell escribió:
>>
>>> This should be simple! I have a series of commits:
>>>
>>>          1---2---3---4---5
>>>
>>> I want to go back to 3 but not branch, so I want
>>>
>>>          1---2---3---4---5---3
>>
>> How about?
>>
>>  git cherry-pick the-sha-1-id-of-commit-3
>
> Correct me if I'm wrong, but I believe this will try to re-apply
> commit 3 (probably a no-op since commit 3 is already in the history,
> perhaps tons of conflicts if 4 and 5 touched the same pieces of code).

I thought the OP was saying that 4 and 5 somehow undid the effect of 3  
and he wanted to reapply it. But he probably meant what you said, he  
just wants to reset back to 3.

Wincent