summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/kernel-dev/kernel-dev-advanced.xml54
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
1490 </para> 1490 </para>
1491</section> 1491</section>
1492 1492
1493<section id='feature-branches'>
1494 <title>Feature Branches</title>
1495
1496 <para>
1497 During active development a new feature, it can be more efficient
1498 to work with that feature as a branch, rather than as a set of
1499 patches which have to be regularly updated.
1500 The Yocto Project Linux kernel tools provide for this with
1501 the <filename>git merge</filename> command.
1502 </para>
1503
1504 <para>
1505 To merge a feature branch into a BSP, insert the
1506 <filename>git merge</filename> command after any
1507 <filename>branch</filename> commands:
1508 <literallayout class='monospaced'>
1509 mybsp.scc:
1510 define KMACHINE mybsp
1511 define KTYPE standard
1512 define KARCH i386
1513 include standard.scc
1514
1515 branch mynewbranch
1516 git merge myfeature
1517
1518 include mybsp.scc
1519 </literallayout>
1520 </para>
1521
1522 <para>
1523 Original text:
1524 <literallayout class='monospaced'>
1525During active development a new feature, it can be more efficient to work with
1526that feature as a branch, rather than as a set of patches which have to be
1527regularly updated. The Yocto Project Linux kernel tools provide for this with
1528the "git merge" command.
1529
1530To merge a feature branch into a BSP, insert the "git merge" command after any
1531branch commands:
1532
1533mybsp.scc:
1534 define KMACHINE mybsp
1535 define KTYPE standard
1536 define KARCH i386
1537 include standard.scc
1538
1539 branch mynewbranch
1540 git merge myfeature
1541
1542 include mybsp.scc
1543 </literallayout>
1544 </para>
1545</section>
1546
1493</chapter> 1547</chapter>
1494<!-- 1548<!--
1495vim: expandtab tw=80 ts=4 1549vim: expandtab tw=80 ts=4