sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

kernel-dev: Edits to the SCC reference section. 

(From yocto-docs rev: 51872ec247e93f9dd7b7c12ee32191565c30ebfa)

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 2013-01-14 12:24:08 -08:00 committed by Richard Purdie
parent 29d5511d02
commit b43b8efcff
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1034,11 +1034,11 @@
</section>
<section id='scc-reference'>
<title>SCC Reference</title>
<title>SCC Description File Reference</title>
<para>
This section provides short descriptions for the commands you can
use from an <filename>.scc</filename>:
This section provides a brief reference for the commands you can use
within an SCC description file (<filename>.scc</filename>):
<itemizedlist>
<listitem><para><filename>branch [ref]</filename>:
Creates a new branch relative to the current branch
@ -1051,13 +1051,15 @@
<filename>KTYPE</filename>, <filename>KARCH</filename>,
and <filename>KFEATURE_DESCRIPTION</filename>.</para></listitem>
<listitem><para><filename>include SCC_FILE</filename>:
Includes an <filename>scc</filename> file in the current file.
It will be parsed as if inserted inline.</para></listitem>
Includes an SCC file in the current file.
The file is parsed as if you had inserted it inline.
</para></listitem>
<listitem><para><filename>kconf [hardware|non-hardware] CFG_FILE</filename>:
Queues a configuration fragment for merging into the final
Linux <filename>.config</filename> file.</para></listitem>
<listitem><para><filename>git merge GIT_BRANCH</filename>:
Merges the feature branch into the current branch.</para></listitem>
Merges the feature branch into the current branch.
</para></listitem>
<listitem><para><filename>patch PATCH_FILE</filename>:
Applies the patch to the current Git branch.</para></listitem>
</itemizedlist>