From 4a2d96130848f636af7b127bd4090e8fc09540b2 Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Tue, 26 Jan 2021 13:50:11 +0700 Subject: [PATCH 1/3] Fix typo in "Inspecting a Remote" As per #1565: master branch on the remote -> local Signed-off-by: Bagas Sanjaya --- book/02-git-basics/sections/remotes.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/02-git-basics/sections/remotes.asc b/book/02-git-basics/sections/remotes.asc index b785ce4bb..0003b8fb7 100644 --- a/book/02-git-basics/sections/remotes.asc +++ b/book/02-git-basics/sections/remotes.asc @@ -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 in the `master` branch on the local after it fetches all the remote references. It also lists all the remote references it has pulled down. That is a simple example you're likely to encounter. From e1ede97cd0804fe0ec86fc9ce05c347b541d56d3 Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Tue, 26 Jan 2021 13:56:53 +0700 Subject: [PATCH 2/3] Fix typo on working directory (tree) As per #1559: nothing to commit, working directory -> tree Signed-off-by: Bagas Sanjaya --- book/02-git-basics/sections/recording-changes.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/02-git-basics/sections/recording-changes.asc b/book/02-git-basics/sections/recording-changes.asc index 54388f93f..d8a586ecf 100644 --- a/book/02-git-basics/sections/recording-changes.asc +++ b/book/02-git-basics/sections/recording-changes.asc @@ -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. From 39c44e35648e577c7c2164969cca9a7b25991f20 Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Wed, 27 Jan 2021 15:00:37 +0700 Subject: [PATCH 3/3] Apply suggestion from @ben Conveying idea that on local repo, pulling by `git pull` will merge in any changes that have happened on the remote side. Co-authored-by: Ben Straub --- book/02-git-basics/sections/remotes.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/02-git-basics/sections/remotes.asc b/book/02-git-basics/sections/remotes.asc index 0003b8fb7..85ab6c845 100644 --- a/book/02-git-basics/sections/remotes.asc +++ b/book/02-git-basics/sections/remotes.asc @@ -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 local 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.