trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: December 2012

Re: [trinity-devel] GIT change

From: Slávek Banko <slavek.banko@...>
Date: Mon, 10 Dec 2012 01:24:34 +0100
On Sunday 09 of December 2012 21:22:16 Darrell Anderson wrote:
> >I may have a simpler procedure:
> >
> >  git pull --rebase
> >
> >Hereby is performed move to the current HEAD == move to new HEAD
> >of newly created repository.
>
> Okay, I went to the top level of my repository, ran git pull --
> rebase and the result was this:
>
> git pull --rebase
>
> remote: Counting objects: 492, done
> remote: Finding sources: 100% (480/480)
> remote: Getting sizes: 105% (19/18)
> remote: Compressing objects: 100% (6/6)
> remote: Total 480 (delta 337), reused 474 (delta 337)
> Receiving objects: 100% (480/480), 55.07 KiB, done.
> Resolving deltas: 100% (337/337), completed with 6 local objects.
> From http://scm.trinitydesktop.org/scm/git/tde
>  + 991e426...1abd6bb master     -> origin/master  (forced update)
>    932cebe..a44f34c  v3.5.13-sru -> origin/v3.5.13-sru
> First, rewinding head to replay your work on top of it...
> Nothing to do.
>
> Am I done?
>
> Darrell
>

Yes, your new master HEAD is 1abd6bb == commit "Recreate repository with 
current state" == commit from upgraded master branch. Try "git log" and see 
that the history of new master branch is quite short.

Slavek
--