Merge pull request #519 from uasi/patch-1

Fix explanation of upstream branch

Author: ben

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

@@ -130,7 +130,7 @@ This gives you a local branch that you can work on that starts where `origin/ser
 ==== Tracking Branches
 
 (((branches, tracking)))(((branches, upstream)))
-Checking out a local branch from a remote-tracking branch automatically creates what is called a ``tracking branch'' (or sometimes an ``upstream branch'').
+Checking out a local branch from a remote-tracking branch automatically creates what is called a ``tracking branch'' (and the branch it tracks is called an ``upstream branch'').
 Tracking branches are local branches that have a direct relationship to a remote branch.
 If you're on a tracking branch and type `git pull`, Git automatically knows which server to fetch from and branch to merge into.
 
@@ -177,7 +177,7 @@ Branch serverfix set up to track remote branch serverfix from origin.
 [NOTE]
 .Upstream shorthand
 ====
-When you have a tracking branch set up, you can reference it with the `@{upstream}` or `@{u}` shorthand.
+When you have a tracking branch set up, you can reference its upstream branch with the `@{upstream}` or `@{u}` shorthand.
 So if you're on the `master` branch and it's tracking `origin/master`, you can say something like `git merge @{u}` instead of `git merge origin/master` if you wish.(((+++@{u}+++)))(((+++@{upstream}+++)))
 ====