[Lilug] Git question, resetting my HEAD to the "main" HEAD

[Justin Dearing]

On Thu, Jun 24, 2010 at 12:07 PM, Mark Drago <markdrago at gmail.com> wrote:

> Justin,
>
> I hope I'm following you right.
>

You were


> Something like this should create oldmaster from master, delete
> master, and then recreate master from the upstream master.  I should
> also point out that the name 'master' is not special in anyway, so
> this isn't strictly necessary, but for cleanliness purposes you might
> want to do this.
>

Thanks for the help on this, both here and out of band. Once command was
missing in the sequence that was causing an error on my netbook and my
laptop. This is different from the scary message we were discussing out of
band yesterday:


> git checkout master
> git checkout -b oldmaster
> git branch -d master
>
git fetch 10gen

> git checkout remotes/origin/master
> git checkout -b master
>

I never fetched from 10gen so my local repo did not know what was available.

Then, create your own custom branch, and cherry pick the commit from
> the oldmaster branch on to it.
> git checkout -b one-line-fix-branch
> git cherry-pick <sha1sum of one line fix commit in oldmaster>
>

I'll consider that strategy.


> I hope that helps.  I also hope that I followed your description correctly.
>

Yes and thank you much.  Also, thanks to Chris for his suggestions.

Regards,

Justin Dearing
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lilug.org/pipermail/lilug-lilug.org/attachments/20100626/74a1b57b/attachment.htm>