everyday.txt: change "tracking branch" to "remote-tracking branch"
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
Nov 2, 2010 at 16:31 UTC
bc6dafc1445a9e04141ed6bf28326114bc2e9191
1 file changed
+3
-3
Documentation/everyday.txt
+3
-3
@@ -180,12 +180,12 @@ directory; clone from it to start a repository on the satellite
180
machine.
181
<2> clone sets these configuration variables by default.
182
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.
184
<3> arrange `git push` to push local `master` branch to
185
`remotes/satellite/master` branch of the mothership machine.
186
<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.
189
<5> on mothership machine, merge the work done on the satellite
190
machine into the master branch.
191