Fix explanation of upstream branch #519
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
||
| (((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 being tracked by it is called an ``upstream branch''). |
There was a problem hiding this comment.
How about "…and the branch it tracks is called…"
|
Lovely! Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A tracking branch is not an upstream of something.
Back in pre-git-v1.7 era “tracking branch” also meant remote-tracking branch, and that kind of tracking branch was often an upstream of a local branch.
Today the terminology has been clarified, so a “tracking branch” usually is (at least in the rest of this section) a local branch that tracks an upstream branch.