From: Felipe Contreras <felipe.contreras@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] fetch: add missing documentation
Date: Tue, 24 Sep 2013 00:23:21 -0500 [thread overview]
Message-ID: <CAMP44s1FFTS=wOcWBfqg3zt3TO-aM83oXHcGwBcwvt_HnXrn8g@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2013-09-24 5:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-21 14:09 [PATCH 0/2] fetch: trivial fixes Felipe Contreras
2013-09-21 14:09 ` [PATCH 1/2] fetch: add missing documentation Felipe Contreras
2013-09-24 5:03 ` Jeff King
2013-09-24 5:23 ` Felipe Contreras [this message]
2013-09-24 5:30 ` Jeff King
2013-09-24 5:36 ` Felipe Contreras
2013-09-24 5:40 ` Jeff King
2013-09-24 5:57 ` Felipe Contreras
2013-09-24 6:10 ` Jeff King
2013-09-24 6:31 ` Felipe Contreras
2013-09-24 6:54 ` Jeff King
2013-09-24 7:41 ` Felipe Contreras
2013-09-21 14:09 ` [PATCH 2/2] remote: fix trivial memory leak Felipe Contreras
2013-09-24 5:19 ` Jeff King
2013-10-15 21:50 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAMP44s1FFTS=wOcWBfqg3zt3TO-aM83oXHcGwBcwvt_HnXrn8g@mail.gmail.com' \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).