From 6fba41057d08008bceed05c1acee51e8461ed722 Mon Sep 17 00:00:00 2001 From: Sergey Kuznetsov Date: Mon, 1 Feb 2021 22:47:05 -0800 Subject: [PATCH] Fix a index for @{u} and @{upstream} in remote-branches.asc --- book/03-git-branching/sections/remote-branches.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/03-git-branching/sections/remote-branches.asc b/book/03-git-branching/sections/remote-branches.asc index 6885f322b..0701dbf96 100644 --- a/book/03-git-branching/sections/remote-branches.asc +++ b/book/03-git-branching/sections/remote-branches.asc @@ -179,7 +179,7 @@ Branch serverfix set up to track remote branch serverfix from origin. .Upstream 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}+++))) +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}))) ==== If you want to see what tracking branches you have set up, you can use the `-vv` option to `git branch`.