[PATCH 10/11] user-manual: remote-tracking can be checked out, with detached HEAD
From: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
Documentation/user-manual.txt | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 62b3788..3108b38 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -360,21 +360,23 @@ $ git branch -r
origin/todo
------------------------------------------------
-In this case, "origin" is called a remote repository, or "remote" for
-short. The branches of this repository are called "remote branches"
-from our point of view. The remote-tracking branches are created in
-the local repository at clone time, as a copy of the remote branches.
-They are references that will be updated by "git fetch" (hence by "git
-pull"), and by "git push". See
-<<Updating-a-repository-With-git-fetch>> for details.
+In this example, "origin" is called a remote repository, or "remote"
+for short. The branches of this repository are called "remote
+branches" from our point of view. The remote-tracking branches listed
+above were created based on the remote branches at clone time and will
+be updated by "git fetch" (hence "git pull) and "git push". See
+<<Updating -a-repository-With-git-fetch>> for details.
-You cannot check out these remote-tracking branches, but you can
-examine them on a branch of your own, just as you would a tag:
+You might want to build on one of these remote-tracking branches
+on a branch of your own, just as you would for a tag:
------------------------------------------------
$ git checkout -b my-todo-copy origin/todo
------------------------------------------------
+You can also check out "origin/todo" directly to examine it or
+write a one-off patch. See <<detached-head,detached head>>.
+
Note that the name "origin" is just the name that git uses by default
to refer to the repository that you cloned from.
@@ -1734,9 +1736,9 @@ accomplish the above with just a simple
$ git pull
-------------------------------------------------
-This command will fetch the changes from the remote branches to your
-remote-tracking branches `origin/*`, and merge default branch in the
-current branch.
+This command will fetch changes from the remote branches to your
+remote-tracking branches `origin/*`, and merge the default branch into
+the current branch.
More generally, a branch that is created from a remote-tracking branch
will pull
--
1.7.3.2.183.g2e7b0
Matthieu Moy <matthieu.moy@imag.fr>