summaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual/dev-manual-model.xml
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2012-10-22 09:02:52 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-23 00:03:13 +0100
commit450f438012db62362221a792b2a93698f11e62f4 (patch)
treeea9e4f3fbabf8bd8f36e7d4171cf741ce99b5255 /documentation/dev-manual/dev-manual-model.xml
parent205db48480d5c666d680db301c3b4e03232c46da (diff)
downloadpoky-450f438012db62362221a792b2a93698f11e62f4.tar.gz
documentation: dev-manual - Updates to Git workflow and kernel patch
I updated the sections on the "Git Workflow" in Chapter 4 and the "Patching the Kernel" section in Chapter 5 per Tom Zanussi's review comments. Minor technical changes. (From yocto-docs rev: fd8a291349c06328adebd37f8a9bbeaa49adb44c) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/dev-manual/dev-manual-model.xml')
-rw-r--r--documentation/dev-manual/dev-manual-model.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index 669623bc7f..4452d2a4e2 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -1705,7 +1705,7 @@ directory.</para></listitem>
1705 <literallayout class='monospaced'> 1705 <literallayout class='monospaced'>
1706 $ git init 1706 $ git init
1707 $ git add * 1707 $ git add *
1708 $ git commit 1708 $ git commit -m "initial revision"
1709 </literallayout> 1709 </literallayout>
1710 The above Git commands initialize a Git repository that is based on the 1710 The above Git commands initialize a Git repository that is based on the
1711 files in your current working directory, stage all the files, and commit 1711 files in your current working directory, stage all the files, and commit
@@ -1762,9 +1762,9 @@ directory.</para></listitem>
1762 Once the changes are committed, use the <filename>git format-patch</filename> 1762 Once the changes are committed, use the <filename>git format-patch</filename>
1763 command to generate a patch file: 1763 command to generate a patch file:
1764 <literallayout class='monospaced'> 1764 <literallayout class='monospaced'>
1765 $ git format-patch HEAD~1 1765 $ git format-patch -1
1766 </literallayout> 1766 </literallayout>
1767 The <filename>HEAD~1</filename> part of the command causes Git to generate the 1767 Specifying "-1" causes Git to generate the
1768 patch file for the most recent commit.</para> 1768 patch file for the most recent commit.</para>
1769 <para>At this point, the patch file has all your edits made 1769 <para>At this point, the patch file has all your edits made
1770 to the <filename>file1.c</filename>, <filename>file2.c</filename>, and 1770 to the <filename>file1.c</filename>, <filename>file2.c</filename>, and
@@ -1784,7 +1784,7 @@ directory.</para></listitem>
1784 of the recipe. 1784 of the recipe.
1785 Here is an example: 1785 Here is an example:
1786 <literallayout class='monospaced'> 1786 <literallayout class='monospaced'>
1787 SRC_URI += "file://my_changes.patch" 1787 SRC_URI += "file://0001-&lt;commit-summary-message&gt;.patch"
1788 </literallayout></para></listitem> 1788 </literallayout></para></listitem>
1789 <listitem><para><emphasis>Increment the Recipe Revision Number:</emphasis> 1789 <listitem><para><emphasis>Increment the Recipe Revision Number:</emphasis>
1790 Finally, don't forget to 'bump' the 1790 Finally, don't forget to 'bump' the