Skip to content

Commit

Permalink
everyday.txt: change "tracking branch" to "remote-tracking branch"
Browse files Browse the repository at this point in the history
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Matthieu Moy authored and Junio C Hamano committed Nov 3, 2010
1 parent 60109d0 commit bc6dafc
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Documentation/everyday.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down

0 comments on commit bc6dafc

Please sign in to comment.