From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Tue, 24 Sep 2013 05:23:21 GMT
Subject: Re: [PATCH 1/2] fetch: add missing documentation
Message-ID: <CAMP44s1FFTS=wOcWBfqg3zt3TO-aM83oXHcGwBcwvt_HnXrn8g@mail.gmail.com>
In-Reply-To: <20130924050343.GF2766@sigill.intra.peff.net>

On Tue, Sep 24, 2013 at 12:03 AM, Jeff King <peff@peff.net> wrote:
> On Sat, Sep 21, 2013 at 09:09:22AM -0500, Felipe Contreras wrote:
>
>> There's no mention of the 'origin' default, or the fact that the
>> upstream tracking branch remote is used.
>
> Sounds like a good thing to mention.
>
>> diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
>> index e08a028..7e75dc4 100644
>> --- a/Documentation/git-fetch.txt
>> +++ b/Documentation/git-fetch.txt
>> @@ -37,6 +37,9 @@ or from several repositories at once if <group> is given and
>>  there is a remotes.<group> entry in the configuration file.
>>  (See linkgit:git-config[1]).
>>
>> +When no remote is specified, by the default the `origin` remote will be used,
>
> s/the (default the)/\1/

Right.

>> +unless there's an upstream branch configured for the current branch.
>
> Should this be "upstream remote" rather than "upstream branch"? I don't
> think we should be looking at branch.*.merge at all for git-fetch.

As a general user, how do I configure the "upstream remote"?

-- 
Felipe Contreras