Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions book/03-git-branching/1-git-branching.asc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion book/05-distributed-git/1-distributed-git.asc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.

Expand Down
197 changes: 157 additions & 40 deletions book/06-github/1-github.asc

Large diffs are not rendered by default.

Binary file added book/06-github/images/blink-3-seconds.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added book/06-github/images/blink-comment.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added book/06-github/images/blink-final.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added book/06-github/images/blink-pr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added book/06-github/images/blink-start.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added book/06-github/images/collaborators.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added book/06-github/images/new-repo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions book/07-git-tools/1-git-tools.asc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[[_git_tools]]
== Git Tools

By now, you’ve learned most of the day-to-day commands and workflows that you need to manage or maintain a Git repository for your source code control.
Expand Down