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
2 changes: 1 addition & 1 deletion book/02-git-basics/sections/recording-changes.asc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ If you run this command directly after a clone, you should see something like th
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
nothing to commit, working tree clean
----

This means you have a clean working directory; in other words, none of your tracked files are modified.
Expand Down
2 changes: 1 addition & 1 deletion book/02-git-basics/sections/remotes.asc
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ $ git remote show origin
----

It lists the URL for the remote repository as well as the tracking branch information.
The command helpfully tells you that if you're on the `master` branch and you run `git pull`, it will automatically merge in the `master` branch on the remote after it fetches all the remote references.
The command helpfully tells you that if you're on the `master` branch and you run `git pull`, it will automatically merge the remote's `master` branch into the local one after it has been fetched.
It also lists all the remote references it has pulled down.

That is a simple example you're likely to encounter.
Expand Down