Re: [PATCH 09/10] user-manual.txt: explain better the remote(-tracking) branch terms

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Oct 26, 2010, 03:11 UTC
Message-ID: <vpqr5fdmywj.fsf@bauges.imag.fr>
In-Reply-To: <9A09AA7C-BAE2-4571-8453-17CB3F3256D4@gmail.com>

Thore Husfeldt <thore.husfeldt@gmail.com> writes:

Show 18 quoted lines

>> 
>> 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.
>
> No. Git does not “maintain a copy of [the remote] branches”.

Which part of the sentence is problematic to you ?

Remote-tracking branches _are_ a copy of the branches. The copy is made at "git clone" time, and is periodically updated with "git fetch" later. And it seems to me that "periodically update" is a way to "maintain" the copy up-to-date.

In the latest version of the patch, I changed "maintain" to "keep", following Jakub's remark. Is that better?

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/