git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Change "remote tracking" to "remote-tracking"

From
PWPete Wyckoff <pw@padd.com>
Date
Jul 3, 2013, 22:43 UTC
Message-ID
<20130703224336.GA3702@padd.com>
In-Reply-To
<7vy59ncrjk.fsf@alter.siamese.dyndns.org>
gitster@pobox.com wrote on Wed, 03 Jul 2013 13:33 -0700:
Show 35 quoted lines
> Jonathan Nieder <jrnieder@gmail.com> writes:
> 
> > 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".
> >
> > The rest of the patch looks good.
> 
> Myy reading did hiccup at the same "remote-tracking" used as if it
> were a noun, and your rewritten version reads much better.

Yes, very clear and complete rewrite; thanks. The final paragraph is perhaps duplicative of the first sentence, but adds clarity, so I'm happy as it stands.

Acked-by: Pete Wyckoff <pw@padd.com>
		-- Pete
Previous: Junio C HamanoNext: Michael Schubert
Message 5 of 6 in “Change "remote tracking" to "remote-tracking"”
  1. Change "remote tracking" to "remote-tracking"Michael Schubert, Jul 3, 2013
  2. Johan HerlandJul 3, 2013
  3. Jonathan NiederJul 3, 2013
  4. Junio C HamanoJul 3, 2013
  5. Pete WyckoffJul 3, 2013
  6. Michael SchubertJul 4, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.