Skip to content

Commit 8192c4d

Browse files
authored
Merge pull request #1065 from grgbnc/fixes
Fix #1057 and #1058
2 parents 1b939bc + fa0d4dc commit 8192c4d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

book/03-git-branching/sections/remote-branches.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ image::images/remote-branches-2.png[Local and remote work can diverge.]
3939
To synchronize your work, you run a `git fetch origin` command.
4040
This command looks up which server ``origin'' is (in this case, it's `git.ourcompany.com`), fetches any data from it that you don't yet have, and updates your local database, moving your `origin/master` pointer to its new, more up-to-date position.
4141

42-
.`git fetch` updates your remote references
42+
.`git fetch` updates your remote-tracking branches
4343
image::images/remote-branches-3.png[`git fetch` updates your remote references.]
4444

4545
To demonstrate having multiple remote servers and what remote branches for those remote projects look like, let's assume you have another internal Git server that is used only for development by one of your sprint teams.
@@ -53,7 +53,7 @@ image::images/remote-branches-4.png[Adding another server as a remote.]
5353
Now, you can run `git fetch teamone` to fetch everything the remote `teamone` server has that you don't have yet.
5454
Because that server has a subset of the data your `origin` server has right now, Git fetches no data but sets a remote-tracking branch called `teamone/master` to point to the commit that `teamone` has as its `master` branch.
5555

56-
.Remote tracking branch for `teamone/master`
56+
.Remote-tracking branch for `teamone/master`
5757
image::images/remote-branches-5.png[Remote tracking branch for `teamone/master`.]
5858

5959
[[_pushing_branches]]

0 commit comments

Comments
 (0)