From: Matthieu Moy Date: Tue, 2 Nov 2010 15:31:22 +0000 (+0100) Subject: everyday.txt: change "tracking branch" to "remote-tracking branch" X-Git-Tag: v1.7.4-rc0~122^2~6 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bc6dafc1445a9e04141ed6bf28326114bc2e9191;p=git.git everyday.txt: change "tracking branch" to "remote-tracking branch" Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt index e0ba8cc07..ae413e52a 100644 --- a/Documentation/everyday.txt +++ b/Documentation/everyday.txt @@ -180,12 +180,12 @@ directory; clone from it to start a repository on the satellite machine. <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.