From 74689812a15505b42dca3a93536838a13c7eeb3c Mon Sep 17 00:00:00 2001 From: Paul Morris Date: Thu, 11 Feb 2016 15:04:02 -0500 Subject: [PATCH] Doc: CG 3.3 separate commits and patches subsections --- .../contributor/administration.itexi | 2 +- Documentation/contributor/issues.itexi | 2 +- Documentation/contributor/quick-start.itexi | 2 +- Documentation/contributor/source-code.itexi | 21 +++++++++++++------ 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Documentation/contributor/administration.itexi b/Documentation/contributor/administration.itexi index a392f7d660..510a799d91 100644 --- a/Documentation/contributor/administration.itexi +++ b/Documentation/contributor/administration.itexi @@ -167,7 +167,7 @@ The Patch Meister's responsibilities are: To keep track of all patches submitted for testing and review. This includes scanning the bug and dev email lists looking for any patches submitted by @q{random} contributors and advising them on how to submit -a patch for testing and review. See @ref{Commits and patches}. +a patch for testing and review. See @ref{Patches}. @item To makes sure that any patch submitted has a corresponding Issue Tracker diff --git a/Documentation/contributor/issues.itexi b/Documentation/contributor/issues.itexi index 883328f85a..09925d4208 100644 --- a/Documentation/contributor/issues.itexi +++ b/Documentation/contributor/issues.itexi @@ -825,7 +825,7 @@ email should contain a link to the issue you just added. separate person handling this task.} For contributors/developers: follow the steps in -@ref{Commits and patches}, and @ref{Pushing to staging}. +@ref{Commits}, @ref{Patches}, and @ref{Pushing to staging}. @ignore For people doing maintenance tasks: git-cl is adding issues, James diff --git a/Documentation/contributor/quick-start.itexi b/Documentation/contributor/quick-start.itexi index 9a5b12a7ec..b5ccb3b0b8 100644 --- a/Documentation/contributor/quick-start.itexi +++ b/Documentation/contributor/quick-start.itexi @@ -362,7 +362,7 @@ After entering a commit message, click @qq{OK} to finalize the commit. @advanced{for more information regarding commits and commit -messages, see @ref{Commits and patches}.} +messages, see @ref{Commits}.} @subsubheading 2b. Amend previous commit diff --git a/Documentation/contributor/source-code.itexi b/Documentation/contributor/source-code.itexi index 719c85e041..7c4dc63778 100644 --- a/Documentation/contributor/source-code.itexi +++ b/Documentation/contributor/source-code.itexi @@ -848,7 +848,8 @@ The branches are kept for archival reasons. * The Git contributor's cycle:: * Pulling and rebasing:: * Using local branches:: -* Commits and patches:: +* Commits:: +* Patches:: @end menu @@ -940,7 +941,7 @@ refusing to pull with rebase: your working tree is not up-to-date @noindent it means that you have modified some files in you working tree -without committing changes (see @ref{Commits and patches}); you +without committing changes (see @ref{Commits}); you can use the @command{git@tie{}stash} command to work around this: @example @@ -1088,16 +1089,14 @@ to merge @code{translation} into @code{staging} whenever he has checked that @code{translation} builds successfully. -@node Commits and patches -@subsection Commits and patches +@node Commits +@subsection Commits @menu * Understanding commits:: * Making commits:: * Commit messages:: -* Making patches:: -* Uploading a patch for review:: @end menu @@ -1248,6 +1247,16 @@ involved. Visit the links listed in @ref{Understanding commits} for examples. +@node Patches +@subsection Patches + + +@menu +* Making patches:: +* Uploading a patch for review:: +@end menu + + @node Making patches @unnumberedsubsubsec Making patches -- 2.39.2