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

Re: [PATCH] wording fixes in the user manual and glossary

From
Chris Packham <judge.packham@gmail.com>
Date
May 26, 2014, 07:50 UTC
Message-ID
<5382F237.8070909@gmail.com>
In-Reply-To
<20140525083720.GA28739@hudson.localdomain>
On 25/05/14 20:37, Jeremiah Mahler wrote:
Show 28 quoted lines
> On Sun, May 25, 2014 at 07:56:41PM +1200, Chris Packham wrote:
>> On 25/05/14 15:50, Jeremiah Mahler wrote:
>>> Some minor wording fixes in the user manual and glossary.
> ...
>>>  
>>> -Eventually the developer cloned from will do additional work in her
>>> +Eventually the developer will do additional work in her cloned
>>>  repository, creating new commits and advancing the branches to point
>>>  at the new commits.
>>
>> I agree that the original wording isn't clear but I'm not sure the new
>> wording is any clearer. The paragraph is trying to explain how to fetch
>> upstream changes when they happen. My initial thought was to say
>> "Eventually the developer will do additional work in the upstream
>> repository" but perhaps it is to early to start throwing around terms
>> like upstream. Perhaps just saying "her repository" would be clearest.
>>
> 
> The "developer cloned from will do" didn't sound right to me.
> But it sounds like my interpretation is not what you were trying to
> convey.  I do like the "upstream" term, it helps describe the
> local/remote aspect.
> 
> How about this:
> 
>   Eventually the upstream developer will do additional work in their
>   repository.  Creating new commits and advancing the branches to point
>   at the new commits.
Sounds good to me.
> 
> Then in the next paragraph it will discuss how to use `git fetch`
> to get these remote changes in to the local repository.
> 
Previous: Jeremiah MahlerNext: Ben Aveling
Message 4 of 5 in “wording fixes in the user manual and glossary”
  1. wording fixes in the user manual and glossaryJeremiah Mahler, May 25, 2014
  2. Chris PackhamMay 25, 2014
  3. Jeremiah MahlerMay 25, 2014
  4. Chris PackhamMay 26, 2014
  5. Ben AvelingMay 26, 2014

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.