From: Stefan Beller Date: Fri, 22 May 2015 17:05:54 GMT Subject: Re: [PATCH] submodule documentation: Reorder introductory paragraphs Message-ID: In-Reply-To: On Fri, May 22, 2015 at 7:36 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> On Thu, May 21, 2015 at 1:03 PM, Philip Oakley wrote: >>>> +Submodules are not to be confused with remotes, which are meant >>>> +mainly for branches of the same project; >>> >>> This use of 'branches' didn't work for me. "remotes are meant mainly for >>> branches of the same project" ? > > The "branch" in the original is used in a much wider sense than > usual branch (i.e. ref/heads/ thing you have locally); it refers to > forks of the same project but with a bit of twist. When you say > repository A is a fork of the same project as my local repository, > you would give an impression that A is not the authoritative copy of > the project. But you can say my repository and that repository A > are branches of the same project, you give zero information as to > A's authoritativeness. While this is correct, I think it is also confusing, because 'branch' is a command which deals with local branches only in my perception To deal with remote branches you need to use the commands {remote, fetch, pull}. So when someone mentions "branch" I need to think of local operations in one repository and not on different distributed histories. > >> Submodules should not be confused with remote repositories, which are >> meant to track the same repository, just at another location; ... > > I do not think this is a great improvement. You now conflated > "repository" to mean "project" in the latter half of the sentence, > while you are trying to explain what a "remote repository" is. That's true. > > Your copy of git.git is not the same repository as mine; they have > different histories. Both repositories are used to work on the same > project. "submoules are not remotes, which are other repositories > of the same project", perhaps? That makes sense.