mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-08 08:02:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

kernel-dev: Formatted "Feature Branches" section.

Browse Source 
(From yocto-docs rev: 6225075b08b3585532e60c9aebc0903a4509e51f)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Rifenbark
2012-12-27 15:20:08 -06:00
committed by Richard Purdie
parent 49166264bd
commit ece3e83e8b
1 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
documentation/kernel-dev/kernel-dev-advanced.xml
View File

@@ -1490,6 +1490,60 @@ Note: The "base" branches are an artifact of the way git manages its data
</para>
</section>
<section id='feature-branches'>
<title>Feature Branches</title>
<para>
During active development a new feature, it can be more efficient
to work with that feature as a branch, rather than as a set of
patches which have to be regularly updated.
The Yocto Project Linux kernel tools provide for this with
the <filename>git merge</filename> command.
</para>
<para>
To merge a feature branch into a BSP, insert the
<filename>git merge</filename> command after any
<filename>branch</filename> commands:
<literallayout class='monospaced'>
mybsp.scc:
define KMACHINE mybsp
define KTYPE standard
define KARCH i386
include standard.scc
branch mynewbranch
git merge myfeature
include mybsp.scc
</literallayout>
</para>
<para>
Original text:
<literallayout class='monospaced'>
During active development a new feature, it can be more efficient to work with
that feature as a branch, rather than as a set of patches which have to be
regularly updated. The Yocto Project Linux kernel tools provide for this with
the "git merge" command.
To merge a feature branch into a BSP, insert the "git merge" command after any
branch commands:
mybsp.scc:
define KMACHINE mybsp
define KTYPE standard
define KARCH i386
include standard.scc
branch mynewbranch
git merge myfeature
include mybsp.scc
</literallayout>
</para>
</section>
</chapter>
<!--
vim: expandtab tw=80 ts=4