Now that the documentation is mostly consistant in the use of "remote
branch" Vs "remote-tracking branch", let's make this distinction explicit
early in the user-manual.
Signed-off-by: Matthieu Moy <redacted>
---
Documentation/user-manual.txt | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index d70f3e0..02126f1 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -359,6 +359,11 @@ $ 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, and Git will maintain a copy of these
+branches, called "remote-tracking branches" in the local repository.
+
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:
@@ -1716,6 +1721,10 @@ one step:
$ git pull origin master
-------------------------------------------------
+This command will fetch the changes from the remote branch to your
+remote-tracking branch `origin/master`, and merge the result in the
+current branch.
+
In fact, if you have "master" checked out, then by default "git pull"
merges from the HEAD branch of the origin repository. So often you can
accomplish the above with just a simple
--
1.7.3.2.537.g7e355