Suggest some changes

Author: ben

book/06-github/sections/2-contributing.asc

@@ -43,7 +43,7 @@ Here's how it generally works:
 5. Open a Pull Request on GitHub.
 6. Discuss, and optionally continue committing.
 7. The project owner merges or closes the Pull Request.
-8. Put the changes back in your GitHub public repository.
+8. Sync the updated master back to your fork.
 
 This is basically the Integration Manager workflow covered in <<ch05-distributed-git#_integration_manager>>, but instead of using email to communicate and review changes, teams use GitHub's web based tools.
 
@@ -422,13 +422,9 @@ If you look at <<_md_drag>>, you can see a small ``Parsed as Markdown'' hint abo
 [[_fetch_and_push_on_different_repositories]]
 ==== Keep your GitHub public repository up-to-date
 
-Once you forked from a GitHub repository, your forked repository lives alone and is autonomous regarding the original one.
+Once you've forked a GitHub repository, your repository (your "fork") exists independently from the original.
 In particular, when the original repository has new commits, GitHub informs you by a message like:
-[source,text]
-----
-This branch is X commits behind <organization>:master.
-----
-For example:
+
 [source,text]
 ----
 This branch is 5 commits behind progit:master.
@@ -446,34 +442,39 @@ $ git checkout master <1>
 $ git pull https://github.com/progit/progit2.git <2>
 $ git push origin master <3>
 ----
+
 <1> If you were on another branch, return to `master`.
 <2> Fetch changes from `https://github.com/progit/progit2.git` and merge them into `master`.
 <3> Push your `master` branch to `origin`.
 
-This just works but it is a little verbose.
-Another possibility allows to do the same thing without the need to precise the repositories to pull from and push to.
-To do so, you need a few configuration:
+This works, but it is a little tedious having to spell out the fetch URL every time.
+You can automate this work with a bit of configuration:
 
 [source,console]
 ----
 $ git remote add progit https://github.com/progit/progit2.git <1>
 $ git branch --set-upstream-to=progit/master master <2>
 $ git config --local remote.pushDefault origin <3>
 ----
+
 <1> Add the source repository and give it a name.
     Here, I have chosen to call it `progit`.
-<2> Set your `master` branch follow `progit`.
-    Then your future fetches will fetch from `progit`.
+<2> Set your `master` branch to fetch from the `progit` remote.
 <3> Define the default push repository to `origin`.
 
-Now you can fetch from `progit` and push to `origin` as simply as:
+Once this is done, the workflow becomes much simpler:
 
 [source,console]
 ----
 $ git checkout master <1>
 $ git pull <2>
 $ git push <3>
 ----
+
 <1> If you were on another branch, return to `master`.
 <2> Fetch changes from `progit` and merge changes into `master`.
 <3> Push your `master` branch to `origin`.
+
+This approach can be useful, but it's not without downsides.
+Git will happily do this work for you silently, but it won't warn you if you make a commit to `master`, pull from `progit`, then push to `origin` -- all of those operations are valid with this setup.
+So you'll have to take care never to commit directly to `master`, since that branch effectively belongs to the upstream repository.