[yocto] checking out branches: tracking vs. tags

Chris Larson clarson at kergoth.com
Thu May 24 09:32:22 PDT 2012


On Thu, May 24, 2012 at 8:42 AM, jfabernathy <jfabernathy at gmail.com> wrote:
> On 05/24/2012 11:21 AM, Chris Larson wrote:
>>
>> On Thu, May 24, 2012 at 7:55 AM, jfabernathy<jfabernathy at gmail.com>
>>  wrote:
>>>
>>> the Development Manual Appendix A
>>>
>>> (http://www.yoctoproject.org/docs/current/dev-manual/dev-manual.html#dev-manual-bsp-appendix),
>>> I see the statement:
>>>
>>>  $ git checkout denzil-7.0 -b denzil
>>>
>>>
>>> What I think this does is create me a local branch that is fixed to what
>>> was
>>> committed when the denzil-7.0 tag was created and it will remain that way
>>> and will not track the denzil branch as it gets updated.  Right????
>>>
>>> Now if I want to track the denzil branch as changes are committed, I
>>> think I
>>> do the following.
>>>
>>>  $ git checkout origin/denzil -b denzil
>>>
>>>
>>> Now I can do git pull commands to get the updates that are committed.
>>> Right??
>>
>> Your arguments are backwards. See git help checkout.
>
> I looked at git help and man git, but it is still unclear because if I do
> the first one where I checkout using the tag, I cannot git pull at all; I
> get an error, about not enough information to merge.  However, if I use the
> name of the branch I can now do git pull when changes are committed to
> denzil.  That's why I thought I understood it.  But who knows.

You're right, my mistake. Those commands are fine, and your
understanding is largely correct. I highly recommend reading Pro Git
for further information.
-- 
Christopher Larson



More information about the yocto mailing list