Skip to content

Commit d4d9cff

Browse files
committed
Fix issue progit#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.
1 parent 6346b40 commit d4d9cff

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

book/02-git-basics/sections/remotes.asc

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ $ git remote show origin
189189
----
190190

191191
This command shows which branch is automatically pushed to when you run `git push` while on certain branches.
192-
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`.
192+
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`.
193193

194194
==== Removing and Renaming Remotes
195195

0 commit comments

Comments
 (0)