From ece3e83e8b01f7968ac76c46a3c278c93a6ff448 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Thu, 27 Dec 2012 15:20:08 -0600
Subject: 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>
---
 documentation/kernel-dev/kernel-dev-advanced.xml | 54 ++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

(limited to 'documentation')

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
-- 
cgit v1.2.3-54-g00ecf