Skip to content

Commit 6fba410

Browse files
committed
Fix a index for @{u} and @{upstream} in remote-branches.asc
1 parent 78c016a commit 6fba410

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ Branch serverfix set up to track remote branch serverfix from origin.
179179
.Upstream shorthand
180180
====
181181
When you have a tracking branch set up, you can reference its upstream branch with the `@{upstream}` or `@{u}` shorthand.
182-
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}+++)))
182+
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})))
183183
====
184184

185185
If you want to see what tracking branches you have set up, you can use the `-vv` option to `git branch`.

0 commit comments

Comments
 (0)