From: Michael Schubert <mschub@elegosoft.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
Junio C Hamano <gitster@pobox.com>, Pete Wyckoff <pw@padd.com>
Subject: Re: [PATCH] Change "remote tracking" to "remote-tracking"
Date: Thu, 4 Jul 2013 11:05:12 +0200 [thread overview]
Message-ID: <20130704090511.GA5317@pc> (raw)
In-Reply-To: <20130703183851.GR408@google.com>
On Wed, Jul 03, 2013 at 11:38:51AM -0700, Jonathan Nieder wrote:
> Michael Schubert wrote:
>
> > --- a/Documentation/git-p4.txt
> > +++ b/Documentation/git-p4.txt
> > @@ -180,7 +180,7 @@ subsequent 'sync' operations.
> > Import changes into given branch. If the branch starts with
> > 'refs/', it will be used as is. Otherwise if it does not start
> > with 'p4/', that prefix is added. The branch is assumed to
> > - name a remote tracking, but this can be modified using
> > + name a remote-tracking, but this can be modified using
> > '--import-local', or by giving a full ref name. The default
> > branch is 'master'.
>
> This is confusing both before and after the patch. What is "a remote
> tracking"?
>
> Perhaps:
>
> --branch <ref>::
> Import changes into <ref> instead of refs/remotes/p4/master.
> If <ref> starts with refs/, it is used as is. Otherwise, if
> it does not start with p4/, that prefix is added.
> +
> By default a <ref> not starting with refs/ is treated as the
> name of a remote-tracking branch (under refs/remotes/). This
> behavior can be modified using the --import-local option.
> +
> The default <ref> is "master".
Thanks.
prev parent reply other threads:[~2013-07-04 9:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-03 9:12 [PATCH] Change "remote tracking" to "remote-tracking" Michael Schubert
2013-07-03 10:02 ` Johan Herland
2013-07-03 18:38 ` Jonathan Nieder
2013-07-03 20:33 ` Junio C Hamano
2013-07-03 22:43 ` Pete Wyckoff
2013-07-04 9:05 ` Michael Schubert [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130704090511.GA5317@pc \
--to=mschub@elegosoft.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=pw@padd.com \
/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.
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 NNTP newsgroup(s).