Skip to content

Commit 786f174

Browse files
gitstergitster
committed
Merge branch 'mm/phrase-remote-tracking'
* mm/phrase-remote-tracking: git-branch.txt: mention --set-upstream as a way to change upstream configuration user-manual: remote-tracking can be checked out, with detached HEAD user-manual.txt: explain better the remote(-tracking) branch terms Change incorrect "remote branch" to "remote tracking branch" in C code Change incorrect uses of "remote branch" meaning "remote-tracking" Change "tracking branch" to "remote-tracking branch" everyday.txt: change "tracking branch" to "remote-tracking branch" Change remote tracking to remote-tracking in non-trivial places Replace "remote tracking" with "remote-tracking" Better "Changed but not updated" message in git-status
2 parents b3ff808 + 4eec6f9 commit 786f174

34 files changed

+124
-102
lines changed

‎Documentation/config.txt‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -601,8 +601,9 @@ branch.autosetupmerge::
601601
this behavior can be chosen per-branch using the `--track`
602602
and `--no-track` options. The valid settings are: `false` -- no
603603
automatic setup is done; `true` -- automatic setup is done when the
604-
starting point is a remote branch; `always` -- automatic setup is
605-
done when the starting point is either a local branch or remote
604+
starting point is a remote-tracking branch; `always` --
605+
automatic setup is done when the starting point is either a
606+
local branch or remote-tracking
606607
branch. This option defaults to true.
607608

608609
branch.autosetuprebase::
@@ -613,7 +614,7 @@ branch.autosetuprebase::
613614
When `local`, rebase is set to true for tracked branches of
614615
other local branches.
615616
When `remote`, rebase is set to true for tracked branches of
616-
remote branches.
617+
remote-tracking branches.
617618
When `always`, rebase will be set to true for all tracking
618619
branches.
619620
See "branch.autosetupmerge" for details on how to set up a
@@ -680,7 +681,7 @@ color.branch::
680681
color.branch.<slot>::
681682
Use customized color for branch coloration. `<slot>` is one of
682683
`current` (the current branch), `local` (a local branch),
683-
`remote` (a tracking branch in refs/remotes/), `plain` (other
684+
`remote` (a remote-tracking branch in refs/remotes/), `plain` (other
684685
refs).
685686
+
686687
The value for these configuration variables is a list of colors (at most
@@ -708,7 +709,7 @@ color.diff.<slot>::
708709
color.decorate.<slot>::
709710
Use customized color for 'git log --decorate' output. `<slot>` is one
710711
of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local
711-
branches, remote tracking branches, tags, stash and HEAD, respectively.
712+
branches, remote-tracking branches, tags, stash and HEAD, respectively.
712713

713714
color.grep::
714715
When set to `always`, always highlight matches. When `false` (or
@@ -1102,7 +1103,7 @@ gui.newbranchtemplate::
11021103
linkgit:git-gui[1].
11031104

11041105
gui.pruneduringfetch::
1105-
"true" if linkgit:git-gui[1] should prune tracking branches when
1106+
"true" if linkgit:git-gui[1] should prune remote-tracking branches when
11061107
performing a fetch. The default value is "false".
11071108

11081109
gui.trustmtime::

‎Documentation/everyday.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,12 @@ directory; clone from it to start a repository on the satellite
180180
machine.
181181
<2> clone sets these configuration variables by default.
182182
It arranges `git pull` to fetch and store the branches of mothership
183-
machine to local `remotes/origin/*` tracking branches.
183+
machine to local `remotes/origin/*` remote-tracking branches.
184184
<3> arrange `git push` to push local `master` branch to
185185
`remotes/satellite/master` branch of the mothership machine.
186186
<4> push will stash our work away on `remotes/satellite/master`
187-
tracking branch on the mothership machine. You could use this as
188-
a back-up method.
187+
remote-tracking branch on the mothership machine. You could use this
188+
as a back-up method.
189189
<5> on mothership machine, merge the work done on the satellite
190190
machine into the master branch.
191191

‎Documentation/fetch-options.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ifndef::git-pull[]
3636

3737
-p::
3838
--prune::
39-
After fetching, remove any remote tracking branches which
39+
After fetching, remove any remote-tracking branches which
4040
no longer exist on the remote.
4141
endif::git-pull[]
4242

‎Documentation/git-branch.txt‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@ Note that this will create the new branch, but it will not switch the
3737
working tree to it; use "git checkout <newbranch>" to switch to the
3838
new branch.
3939

40-
When a local branch is started off a remote branch, git sets up the
40+
When a local branch is started off a remote-tracking branch, git sets up the
4141
branch so that 'git pull' will appropriately merge from
42-
the remote branch. This behavior may be changed via the global
42+
the remote-tracking branch. This behavior may be changed via the global
4343
`branch.autosetupmerge` configuration flag. That setting can be
44-
overridden by using the `--track` and `--no-track` options.
44+
overridden by using the `--track` and `--no-track` options, and
45+
changed later using `git branch --set-upstream`.
4546

4647
With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>.
4748
If <oldbranch> had a corresponding reflog, it is renamed to match
@@ -89,7 +90,8 @@ OPTIONS
8990
Move/rename a branch even if the new branch name already exists.
9091

9192
--color[=<when>]::
92-
Color branches to highlight current, local, and remote branches.
93+
Color branches to highlight current, local, and
94+
remote-tracking branches.
9395
The value must be always (the default), never, or auto.
9496

9597
--no-color::
@@ -125,11 +127,11 @@ OPTIONS
125127
it directs `git pull` without arguments to pull from the
126128
upstream when the new branch is checked out.
127129
+
128-
This behavior is the default when the start point is a remote branch.
130+
This behavior is the default when the start point is a remote-tracking branch.
129131
Set the branch.autosetupmerge configuration variable to `false` if you
130132
want `git checkout` and `git branch` to always behave as if '--no-track'
131133
were given. Set it to `always` if you want this behavior when the
132-
start-point is either a local or remote branch.
134+
start-point is either a local or remote-tracking branch.
133135

134136
--no-track::
135137
Do not set up "upstream" configuration, even if the

‎Documentation/git-checkout.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ entries; instead, unmerged entries are ignored.
9898
"--track" in linkgit:git-branch[1] for details.
9999
+
100100
If no '-b' option is given, the name of the new branch will be
101-
derived from the remote branch. If "remotes/" or "refs/remotes/"
101+
derived from the remote-tracking branch. If "remotes/" or "refs/remotes/"
102102
is prefixed it is stripped away, and then the part up to the
103103
next slash (which would be the nickname of the remote) is removed.
104104
This would tell us to use "hack" as the local branch when branching

‎Documentation/git-clone.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ objects from the source repository into a pack in the cloned repository.
131131
Set up a mirror of the source repository. This implies `--bare`.
132132
Compared to `--bare`, `--mirror` not only maps local branches of the
133133
source to local branches of the target, it maps all refs (including
134-
remote branches, notes etc.) and sets up a refspec configuration such
134+
remote-tracking branches, notes etc.) and sets up a refspec configuration such
135135
that all these refs are overwritten by a `git remote update` in the
136136
target repository.
137137

‎Documentation/git-describe.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ OPTIONS
3737
--all::
3838
Instead of using only the annotated tags, use any ref
3939
found in `.git/refs/`. This option enables matching
40-
any known branch, remote branch, or lightweight tag.
40+
any known branch, remote-tracking branch, or lightweight tag.
4141

4242
--tags::
4343
Instead of using only the annotated tags, use any tag

‎Documentation/git-fetch.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The ref names and their object names of fetched refs are stored
2626
in `.git/FETCH_HEAD`. This information is left for a later merge
2727
operation done by 'git merge'.
2828

29-
When <refspec> stores the fetched result in tracking branches,
29+
When <refspec> stores the fetched result in remote-tracking branches,
3030
the tags that point at these branches are automatically
3131
followed. This is done by first fetching from the remote using
3232
the given <refspec>s, and if the repository has objects that are

‎Documentation/git-gc.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ are not part of the current project most users will want to expire
8989
them sooner. This option defaults to '30 days'.
9090

9191
The above two configuration variables can be given to a pattern. For
92-
example, this sets non-default expiry values only to remote tracking
92+
example, this sets non-default expiry values only to remote-tracking
9393
branches:
9494

9595
------------
@@ -128,8 +128,8 @@ Notes
128128

129129
'git gc' tries very hard to be safe about the garbage it collects. In
130130
particular, it will keep not only objects referenced by your current set
131-
of branches and tags, but also objects referenced by the index, remote
132-
tracking branches, refs saved by 'git filter-branch' in
131+
of branches and tags, but also objects referenced by the index,
132+
remote-tracking branches, refs saved by 'git filter-branch' in
133133
refs/original/, or reflogs (which may reference commits in branches
134134
that were later amended or rewound).
135135

‎Documentation/git-log.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ git log --follow builtin-rev-list.c::
116116
git log --branches --not --remotes=origin::
117117

118118
Shows all commits that are in any of local branches but not in
119-
any of remote tracking branches for 'origin' (what you have that
119+
any of remote-tracking branches for 'origin' (what you have that
120120
origin doesn't).
121121

122122
git log master --not --remotes=*/master::

0 commit comments

Comments
 (0)