diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2012-04-25 10:54:34 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-01 21:00:28 +0100 |
commit | 42a9a5077175be522470c9a07a4ef0045e76acac (patch) | |
tree | 249acb4b5b618640cbcd25b63ac40574447dd518 /documentation/dev-manual | |
parent | 74c34c9d3c2a5f28d7e0bac3a5437ecd144e7367 (diff) | |
download | poky-42a9a5077175be522470c9a07a4ef0045e76acac.tar.gz |
documentation/dev-manual/dev-manual-newbie.xml: Tag example fixed
The example that creates a local branch based on a release tag
in the "Repositories, Tags, and Branches" section was not optimal.
Darren Hart informed me that naming a local branch the same name
as a tag confuses Git. Plus, the "-b" option was mis-placed.
Renamed the local branch to have "my-" in front of it and moved
the "-b" option earlier in the command.
(From yocto-docs rev: 24ab16d18fb317efb86d2c4ddb2ac1a1449df519)
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/dev-manual')
-rw-r--r-- | documentation/dev-manual/dev-manual-newbie.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml index 7dfedd93b0..1f41d1e935 100644 --- a/documentation/dev-manual/dev-manual-newbie.xml +++ b/documentation/dev-manual/dev-manual-newbie.xml | |||
@@ -579,14 +579,14 @@ | |||
579 | $ cd ~ | 579 | $ cd ~ |
580 | $ git clone git://git.yoctoproject.org/poky | 580 | $ git clone git://git.yoctoproject.org/poky |
581 | $ cd poky | 581 | $ cd poky |
582 | $ git checkout &DISTRO_NAME;-&POKYVERSION; -b &DISTRO_NAME;-&POKYVERSION; | 582 | $ git checkout -b my-&DISTRO_NAME;-&POKYVERSION; &DISTRO_NAME;-&POKYVERSION; |
583 | </literallayout> | 583 | </literallayout> |
584 | In this example, the name of the top-level directory of your local Yocto Project | 584 | In this example, the name of the top-level directory of your local Yocto Project |
585 | Files Git repository is <filename>poky</filename>. | 585 | Files Git repository is <filename>poky</filename>. |
586 | And, the name of the local branch you have created and checked out is | 586 | And, the name of the local branch you have created and checked out is |
587 | <filename>&DISTRO_NAME;-&POKYVERSION;</filename>. | 587 | <filename>my-&DISTRO_NAME;-&POKYVERSION;</filename>. |
588 | The files in your repository now exactly match the Yocto Project &DISTRO; | 588 | The files in your repository now exactly match the Yocto Project &DISTRO; |
589 | Release tag (&DISTRO_NAME;). | 589 | Release tag (<filename>&DISTRO_NAME;-&POKYVERSION;</filename>). |
590 | It is important to understand that when you create and checkout a local | 590 | It is important to understand that when you create and checkout a local |
591 | working branch based on a tag, your environment matches a specific point | 591 | working branch based on a tag, your environment matches a specific point |
592 | in time and not a development branch. | 592 | in time and not a development branch. |