On 25/05/14 20:37, Jeremiah Mahler wrote: > 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. > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html