Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Incorrect symbolic link to image and typo #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Incorrect symbolic link to image and typo #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2850d89
Fix symbolic link to image git_0-300dpi.png
CexyNature Jan 29, 2019
d88e3e0
Fix wording/typo in text
CexyNature Jan 29, 2019
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
2 changes: 1 addition & 1 deletion 3.0-branching.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Covered commands + concepts:
Branching is a way for us to work on different features in an isolated environment.

As we've talked about in this lesson, commits are repository snapshots.
![snapshots](git_0-300dpi.png)
![snapshots](images/git_0-300dpi.png)

A branch is a pointer to a commit (the most recent commit in the branch history).
![branch pointer](images/git_1-300dpi.png)
Expand Down
2 changes: 1 addition & 1 deletion 7.0-collaboration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ our code and make changes separately, and we can integrate those changes in our
own time.

Earlier we talked about `git fetch` and `get merge`. These two commands together
are `git pull`. A pull request is a request from a user for the a collaborator
are `git pull`. A pull request is a request from an user for the collaborator
or organization to pull (or fetch and merge) their changes into their own
repository. This is the way that we incorporate our work into another repository
without commit rights. Pull requests can also be submitted on a single
Expand Down