diff options
author | Scott Rifenbark <srifenbark@gmail.com> | 2017-06-07 09:14:52 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-14 10:19:24 +0100 |
commit | f29a05dd856bc38977866a4ac41c87ba6af6e3d0 (patch) | |
tree | 8fde830967aea7d13a9f77e3d24d6347b7727097 /documentation | |
parent | ded9a2f6b39df610cfc2a1f47b5e7025133b959a (diff) | |
download | poky-f29a05dd856bc38977866a4ac41c87ba6af6e3d0.tar.gz |
dev-manual: Formed ordered list for email patch procedure
The section that describes how to create a patch and send it via
email is really an ordered procedure. I recast the list of steps
using numbers instead of bullets.
(From yocto-docs rev: c2d2256ca6d8c8b837bae87a5bd8a3118553935c)
Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r-- | documentation/dev-manual/dev-manual-newbie.xml | 137 |
1 files changed, 83 insertions, 54 deletions
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml index 4fd0d3a60c..2a62fd96c6 100644 --- a/documentation/dev-manual/dev-manual-newbie.xml +++ b/documentation/dev-manual/dev-manual-newbie.xml | |||
@@ -1722,8 +1722,8 @@ | |||
1722 | </para> | 1722 | </para> |
1723 | 1723 | ||
1724 | <para> | 1724 | <para> |
1725 | Depending on the components changed, you need to submit the email to a specific | 1725 | Depending on the components changed, you need to submit the email |
1726 | mailing list. | 1726 | to a specific mailing list. |
1727 | For some guidance on which mailing list to use, see the list in the | 1727 | For some guidance on which mailing list to use, see the list in the |
1728 | "<link linkend='how-to-submit-a-change'>How to Submit a Change</link>" | 1728 | "<link linkend='how-to-submit-a-change'>How to Submit a Change</link>" |
1729 | section. | 1729 | section. |
@@ -1735,24 +1735,34 @@ | |||
1735 | <para> | 1735 | <para> |
1736 | Here is the general procedure on how to submit a patch through email without using the | 1736 | Here is the general procedure on how to submit a patch through email without using the |
1737 | scripts: | 1737 | scripts: |
1738 | <itemizedlist> | 1738 | <orderedlist> |
1739 | <listitem><para>Make your changes in your local Git repository.</para></listitem> | 1739 | <listitem><para> |
1740 | <listitem><para>Stage your changes by using the <filename>git add</filename> | 1740 | Make your changes in your local Git repository. |
1741 | command on each file you changed.</para></listitem> | 1741 | </para></listitem> |
1742 | <listitem><para>Commit the change by using the | 1742 | <listitem><para> |
1743 | Stage your changes by using the | ||
1744 | <filename>git add</filename> command on each file you | ||
1745 | changed. | ||
1746 | </para></listitem> | ||
1747 | <listitem><para> | ||
1748 | Commit the change by using the | ||
1743 | <filename>git commit --signoff</filename> command. | 1749 | <filename>git commit --signoff</filename> command. |
1744 | Using the <filename>--signoff</filename> option identifies you as the person | 1750 | Using the <filename>--signoff</filename> option identifies |
1745 | making the change and also satisfies the Developer's Certificate of | 1751 | you as the person making the change and also satisfies |
1746 | Origin (DCO) shown earlier.</para> | 1752 | the Developer's Certificate of Origin (DCO) shown earlier. |
1747 | <para>When you form a commit, you must follow certain standards established by the | 1753 | </para> |
1748 | Yocto Project development team. | 1754 | <para>When you form a commit, you must follow certain |
1755 | standards established by the Yocto Project development | ||
1756 | team. | ||
1749 | See the earlier section | 1757 | See the earlier section |
1750 | "<link linkend='how-to-submit-a-change'>How to Submit a Change</link>" | 1758 | "<link linkend='how-to-submit-a-change'>How to Submit a Change</link>" |
1751 | for Yocto Project commit message standards.</para></listitem> | 1759 | for Yocto Project commit message standards. |
1760 | </para></listitem> | ||
1752 | <listitem><para>Format the commit into an email message. | 1761 | <listitem><para>Format the commit into an email message. |
1753 | To format commits, use the <filename>git format-patch</filename> command. | 1762 | To format commits, use the |
1754 | When you provide the command, you must include a revision list or a number of patches | 1763 | <filename>git format-patch</filename> command. |
1755 | as part of the command. | 1764 | When you provide the command, you must include a revision |
1765 | list or a number of patches as part of the command. | ||
1756 | For example, either of these two commands takes your most | 1766 | For example, either of these two commands takes your most |
1757 | recent single commit and formats it as an email message in | 1767 | recent single commit and formats it as an email message in |
1758 | the current directory: | 1768 | the current directory: |
@@ -1763,50 +1773,69 @@ | |||
1763 | <literallayout class='monospaced'> | 1773 | <literallayout class='monospaced'> |
1764 | $ git format-patch HEAD~ | 1774 | $ git format-patch HEAD~ |
1765 | </literallayout></para> | 1775 | </literallayout></para> |
1766 | <para>After the command is run, the current directory contains a | 1776 | <para>After the command is run, the current directory |
1767 | numbered <filename>.patch</filename> file for the commit.</para> | 1777 | contains a numbered <filename>.patch</filename> file for |
1768 | <para>If you provide several commits as part of the command, | 1778 | the commit.</para> |
1769 | the <filename>git format-patch</filename> command produces a | 1779 | <para>If you provide several commits as part of the |
1770 | series of numbered files in the current directory – one for each commit. | 1780 | command, the <filename>git format-patch</filename> command |
1781 | produces a series of numbered files in the current | ||
1782 | directory – one for each commit. | ||
1771 | If you have more than one patch, you should also use the | 1783 | If you have more than one patch, you should also use the |
1772 | <filename>--cover</filename> option with the command, which generates a | 1784 | <filename>--cover</filename> option with the command, |
1773 | cover letter as the first "patch" in the series. | 1785 | which generates a cover letter as the first "patch" in |
1774 | You can then edit the cover letter to provide a description for | 1786 | the series. |
1775 | the series of patches. | 1787 | You can then edit the cover letter to provide a |
1776 | For information on the <filename>git format-patch</filename> command, | 1788 | description for the series of patches. |
1777 | see <filename>GIT_FORMAT_PATCH(1)</filename> displayed using the | 1789 | For information on the |
1778 | <filename>man git-format-patch</filename> command.</para> | 1790 | <filename>git format-patch</filename> command, |
1779 | <note>If you are or will be a frequent contributor to the Yocto Project | 1791 | see <filename>GIT_FORMAT_PATCH(1)</filename> displayed |
1780 | or to OpenEmbedded, you might consider requesting a contrib area and the | 1792 | using the <filename>man git-format-patch</filename> |
1781 | necessary associated rights.</note></listitem> | 1793 | command. |
1782 | <listitem><para>Import the files into your mail client by using the | 1794 | <note> |
1795 | If you are or will be a frequent contributor to the | ||
1796 | Yocto Project or to OpenEmbedded, you might consider | ||
1797 | requesting a contrib area and the necessary associated | ||
1798 | rights. | ||
1799 | </note> | ||
1800 | </para></listitem> | ||
1801 | <listitem><para> | ||
1802 | Import the files into your mail client by using the | ||
1783 | <filename>git send-email</filename> command. | 1803 | <filename>git send-email</filename> command. |
1784 | <note>In order to use <filename>git send-email</filename>, you must have the | 1804 | <note> |
1785 | the proper Git packages installed. | 1805 | In order to use <filename>git send-email</filename>, |
1786 | For Ubuntu, Debian, and Fedora the package is <filename>git-email</filename>.</note></para> | 1806 | you must have the proper Git packages installed. |
1787 | <para>The <filename>git send-email</filename> command sends email by using a local | 1807 | For Ubuntu, Debian, and Fedora the package is |
1788 | or remote Mail Transport Agent (MTA) such as | 1808 | <filename>git-email</filename>. |
1789 | <filename>msmtp</filename>, <filename>sendmail</filename>, or through a direct | 1809 | </note></para> |
1790 | <filename>smtp</filename> configuration in your Git <filename>config</filename> | 1810 | <para>The <filename>git send-email</filename> command |
1791 | file. | 1811 | sends email by using a local or remote Mail Transport Agent |
1792 | If you are submitting patches through email only, it is very important | 1812 | (MTA) such as <filename>msmtp</filename>, |
1793 | that you submit them without any whitespace or HTML formatting that | 1813 | <filename>sendmail</filename>, or through a direct |
1794 | either you or your mailer introduces. | 1814 | <filename>smtp</filename> configuration in your Git |
1795 | The maintainer that receives your patches needs to be able to save and | 1815 | <filename>config</filename> file. |
1796 | apply them directly from your emails. | 1816 | If you are submitting patches through email only, it is |
1797 | A good way to verify that what you are sending will be applicable by the | 1817 | very important that you submit them without any whitespace |
1798 | maintainer is to do a dry run and send them to yourself and then | 1818 | or HTML formatting that either you or your mailer |
1799 | save and apply them as the maintainer would.</para> | 1819 | introduces. |
1800 | <para>The <filename>git send-email</filename> command is the preferred method | 1820 | The maintainer that receives your patches needs to be able |
1801 | for sending your patches since there is no risk of compromising whitespace | 1821 | to save and apply them directly from your emails. |
1802 | in the body of the message, which can occur when you use your own mail client. | 1822 | A good way to verify that what you are sending will be |
1823 | applicable by the maintainer is to do a dry run and send | ||
1824 | them to yourself and then save and apply them as the | ||
1825 | maintainer would.</para> | ||
1826 | <para>The <filename>git send-email</filename> command is | ||
1827 | the preferred method for sending your patches since there | ||
1828 | is no risk of compromising whitespace in the body of the | ||
1829 | message, which can occur when you use your own mail client. | ||
1803 | The command also has several options that let you | 1830 | The command also has several options that let you |
1804 | specify recipients and perform further editing of the email message. | 1831 | specify recipients and perform further editing of the |
1805 | For information on how to use the <filename>git send-email</filename> command, | 1832 | email message. |
1833 | For information on how to use the | ||
1834 | <filename>git send-email</filename> command, | ||
1806 | see <filename>GIT-SEND-EMAIL(1)</filename> displayed using | 1835 | see <filename>GIT-SEND-EMAIL(1)</filename> displayed using |
1807 | the <filename>man git-send-email</filename> command. | 1836 | the <filename>man git-send-email</filename> command. |
1808 | </para></listitem> | 1837 | </para></listitem> |
1809 | </itemizedlist> | 1838 | </orderedlist> |
1810 | </para> | 1839 | </para> |
1811 | </section> | 1840 | </section> |
1812 | </section> | 1841 | </section> |