From db00798149e2800175f77d91f244dbc6beb22bb5 Mon Sep 17 00:00:00 2001 From: Darnokiv <85449868+Darnokiv@users.noreply.github.com> Date: Sat, 18 Jun 2022 15:56:33 +0200 Subject: [PATCH 1/2] Deleted duplicated paragraph Deleted the duplicated paragraph "Committing Changes" (already in the paragraph "Staging and Committing Files") and changed "git add" to "git add -p". All accordingly to https://github.com/python/devguide/issues/888 --- gitbootcamp.rst | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/gitbootcamp.rst b/gitbootcamp.rst index 9196da081..95df9a842 100644 --- a/gitbootcamp.rst +++ b/gitbootcamp.rst @@ -194,7 +194,7 @@ Staging and Committing Files 2. To stage the files to be included in your commit:: - git add + git add -p 3. To commit the files that have been staged (done in step 2): @@ -225,21 +225,6 @@ To re-apply the last stashed change:: git stash pop -.. _commit-changes: - -Committing Changes ------------------- - -Add the files you want to commit:: - - git add - -Commit the files: - -.. code-block:: bash - - git commit -m "" - .. _diff-changes: Comparing Changes From 4a52cc2d005f245ff7c0d55bf5d3322428564706 Mon Sep 17 00:00:00 2001 From: Darnokiv <85449868+Darnokiv@users.noreply.github.com> Date: Sun, 19 Jun 2022 09:30:07 +0200 Subject: [PATCH 2/2] Corrected "git add -p" Corrected a mistake with "git add -p" and added the normal "git add" command again Co-authored-by: Ezio Melotti --- gitbootcamp.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitbootcamp.rst b/gitbootcamp.rst index 95df9a842..6ab834f1f 100644 --- a/gitbootcamp.rst +++ b/gitbootcamp.rst @@ -194,7 +194,8 @@ Staging and Committing Files 2. To stage the files to be included in your commit:: - git add -p + git add -p # to review and add changes to existing files + git add # to add new files 3. To commit the files that have been staged (done in step 2):