From d4d9cffb9aafa6bbb27a51391afb1a7c8d0a4ae6 Mon Sep 17 00:00:00 2001 From: Yue Lin Ho Date: Sat, 20 Feb 2016 14:19:28 +0800 Subject: [PATCH] Fix issue #533: Not all local branches can merge with its remote-tracking branch by a single git pull command at once The merge feature of git pull only works on current branch. --- 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 cffb0aca9..b6b095d05 100644 --- a/book/02-git-basics/sections/remotes.asc +++ b/book/02-git-basics/sections/remotes.asc @@ -189,7 +189,7 @@ $ git remote show origin ---- This command shows which branch is automatically pushed to when you run `git push` while on certain branches. -It also shows you which remote branches on the server you don't yet have, which remote branches you have that have been removed from the server, and multiple branches that are automatically merged when you run `git pull`. +It also shows you which remote branches on the server you don't yet have, which remote branches you have that have been removed from the server, and multiple local branches that are able to merge automatically with their remote-tracking branch when you run `git pull`. ==== Removing and Renaming Remotes