Merge pull request #48 from schacon/chapter-six

Chapter Six: GitHub

Author: ben

book/03-git-branching/1-git-branching.asc

@@ -584,6 +584,7 @@ Some larger projects also have a `proposed` or `pu` (proposed updates) branch th
 The idea is that your branches are at various levels of stability; when they reach a more stable level, they're merged into the branch above them.
 Again, having multiple long-running branches isn't necessary, but it's often helpful, especially when you're dealing with very large or complex projects.
 
+[[_topic_branches]]
 ==== Topic Branches
 
 Topic branches, however, are useful in projects of any size.

book/04-git-server/1-git-server.asc

@@ -256,6 +256,7 @@ This doesn’t affect the commit data in any way – the SSH user you connect as
 Another way to do it is to have your SSH server authenticate from an LDAP server or some other centralized authentication source that you may already have set up.
 As long as each user can get shell access on the machine, any SSH authentication mechanism you can think of should work.
 
+[[_generate_ssh_key]]
 === Generating Your SSH Public Key
 
 That being said, many Git servers authenticate using SSH public keys.

book/05-distributed-git/1-distributed-git.asc

@@ -36,6 +36,7 @@ Then Jessica tries to push her changes, but the server rejects them.
 She is told that she's trying to push non-fast-forward changes and that she won’t be able to do so until she fetches and merges.
 This workflow is attractive to a lot of people because it’s a paradigm that many are familiar and comfortable with.
 
+[[_integration_manager]]
 ==== Integration-Manager Workflow
 
 Because Git allows you to have multiple remote repositories, it’s possible to have a workflow where each developer has write access to their own public repository and read access to everyone else’s.
@@ -56,7 +57,7 @@ The process works as follow (see <<wfdiag_b>>):
 .Integration-manager workflow.
 image::images/18333fig0502-tn.png[Integration-manager workflow.]
 
-This is a very common workflow with sites like GitHub, where it’s easy to fork a project and push your changes into your fork for everyone to see.
+This is a very common workflow with hub-based tools like GitHub or GitLab, where it’s easy to fork a project and push your changes into your fork for everyone to see.
 One of the main advantages of this approach is that you can continue to work, and the maintainer of the main repository can pull in your changes at any time.
 Contributors don’t have to wait for the project to incorporate their changes – each party can work at their own pace.