diff options
| author |   Scott Rifenbark <scott.m.rifenbark@intel.com> | 2012-12-27 15:20:08 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-16 15:59:12 +0000 |
| commit | ece3e83e8b01f7968ac76c46a3c278c93a6ff448 (patch) | |
| tree | e3ecb518a7b16d344e93fc0a93c79d816c511b62 /documentation/kernel-dev/kernel-dev-advanced.xml | |
| parent | 49166264bd93d2e4c0b4fcf3641468b37ca18b84 (diff) | |
| download | openembedded-core-contrib-ece3e83e8b01f7968ac76c46a3c278c93a6ff448.tar.gz | |
kernel-dev: Formatted "Feature Branches" section.
(From yocto-docs rev: 6225075b08b3585532e60c9aebc0903a4509e51f)
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/kernel-dev/kernel-dev-advanced.xml')
| -rw-r--r-- | documentation/kernel-dev/kernel-dev-advanced.xml | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/documentation/kernel-dev/kernel-dev-advanced.xml b/documentation/kernel-dev/kernel-dev-advanced.xml index dbc3dfbe89..371a3b46db 100644 --- a/documentation/kernel-dev/kernel-dev-advanced.xml +++ b/documentation/kernel-dev/kernel-dev-advanced.xml @@ -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 |