path: root/Documentation/everyday.txt
diff options
authorMatthieu Moy <>2010-11-02 15:31:22 (GMT)
committerJunio C Hamano <>2010-11-03 16:19:10 (GMT)
commitbc6dafc1445a9e04141ed6bf28326114bc2e9191 (patch)
tree964b06684d5b546201df55e837158bd82b2819dd /Documentation/everyday.txt
parent60109d0ef5974b5066b6998fafe1da7187174c88 (diff)
everyday.txt: change "tracking branch" to "remote-tracking branch"
Signed-off-by: Matthieu Moy <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/everyday.txt')
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt
index e0ba8cc..ae413e5 100644
--- a/Documentation/everyday.txt
+++ b/Documentation/everyday.txt
@@ -180,12 +180,12 @@ directory; clone from it to start a repository on the satellite
<2> clone sets these configuration variables by default.
It arranges `git pull` to fetch and store the branches of mothership
-machine to local `remotes/origin/*` tracking branches.
+machine to local `remotes/origin/*` remote-tracking branches.
<3> arrange `git push` to push local `master` branch to
`remotes/satellite/master` branch of the mothership machine.
<4> push will stash our work away on `remotes/satellite/master`
-tracking branch on the mothership machine. You could use this as
-a back-up method.
+remote-tracking branch on the mothership machine. You could use this
+as a back-up method.
<5> on mothership machine, merge the work done on the satellite
machine into the master branch.