From: Mihai Lindner <mihaix.lindner@linux.intel.com>
To: yocto@yoctoproject.org
Subject: Re: checking out branches: tracking vs. tags
Date: Thu, 24 May 2012 20:00:44 +0300 [thread overview]
Message-ID: <4FBE693C.7040506@linux.intel.com> (raw)
In-Reply-To: <CABcZANnO3p7AfG1a4cm=PLZv74=-F_zm1Z6=9CTG9yLDw4fONg@mail.gmail.com>
On 05/24/2012 07:32 PM, Chris Larson wrote:
> On Thu, May 24, 2012 at 8:42 AM, jfabernathy<jfabernathy@gmail.com> wrote:
>> On 05/24/2012 11:21 AM, Chris Larson wrote:
>>>
>>> On Thu, May 24, 2012 at 7:55 AM, jfabernathy<jfabernathy@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.
If you checkout the tag you get the source as it was when the tag was made, without being able to pull, as there's nothing new to be pulled (in detached head state, that's why you get an error). You may see it as a snapshot of the repository.
If you checkout the branch, you'll pull commits brought to that remote branch.
Bye,
--
Mihai Lindner
prev parent reply other threads:[~2012-05-24 16:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-24 14:55 checking out branches: tracking vs. tags jfabernathy
2012-05-24 15:21 ` Chris Larson
2012-05-24 15:42 ` jfabernathy
2012-05-24 16:32 ` Chris Larson
2012-05-24 17:00 ` Mihai Lindner [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FBE693C.7040506@linux.intel.com \
--to=mihaix.lindner@linux.intel.com \
--cc=yocto@yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.