From 1b63136780a4bb90ac54128bc74c45b0cccdaf44 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Sun, 9 Aug 2020 13:19:49 +0200 Subject: [PATCH 1/2] Rewrite summary for contributing to a project Closes #692 --- book/05-distributed-git/sections/contributing.asc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/book/05-distributed-git/sections/contributing.asc b/book/05-distributed-git/sections/contributing.asc index 9ae2740ea..5b4dff716 100644 --- a/book/05-distributed-git/sections/contributing.asc +++ b/book/05-distributed-git/sections/contributing.asc @@ -787,6 +787,11 @@ Result: OK ==== Summary -This section has covered a number of common workflows for dealing with several very different types of Git projects you're likely to encounter, and introduced a couple of new tools to help you manage this process. +We covered multiple workflows, and talked about the differences between working as part of a small team on closed-source projects vs contributing to a big public project. +You know to check for white-space errors before committing, and can write a great commit message. +You learned how to format patches, and e-mail them to a developer mailing list. +Dealing with merges was also covered in the context of the different workflows. +You are now well prepared to collaborate on any project. + Next, you'll see how to work the other side of the coin: maintaining a Git project. You'll learn how to be a benevolent dictator or integration manager. From 9c6127066ddd1f2289600f11d53860158d017c75 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Sun, 16 Aug 2020 08:03:28 +0200 Subject: [PATCH 2/2] Improve start of sentence Co-authored-by: Ben Straub --- book/05-distributed-git/sections/contributing.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/05-distributed-git/sections/contributing.asc b/book/05-distributed-git/sections/contributing.asc index 5b4dff716..c42ab3ff2 100644 --- a/book/05-distributed-git/sections/contributing.asc +++ b/book/05-distributed-git/sections/contributing.asc @@ -787,7 +787,7 @@ Result: OK ==== Summary -We covered multiple workflows, and talked about the differences between working as part of a small team on closed-source projects vs contributing to a big public project. +In this section, we covered multiple workflows, and talked about the differences between working as part of a small team on closed-source projects vs contributing to a big public project. You know to check for white-space errors before committing, and can write a great commit message. You learned how to format patches, and e-mail them to a developer mailing list. Dealing with merges was also covered in the context of the different workflows.