git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: Philip Oakley <philipoakley@iee.org>,
	Jonathan Nieder <jrnieder@gmail.com>,
	"git\@vger.kernel.org" <git@vger.kernel.org>,
	Petr Baudis <pasky@suse.cz>, Heiko Voigt <hvoigt@hvoigt.net>
Subject: Re: [PATCH] submodule documentation: Reorder introductory paragraphs
Date: Fri, 22 May 2015 07:36:44 -0700	[thread overview]
Message-ID: <xmqqwq00fzlv.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAGZ79kZ5yxG7k++9QFRhnb=6A3HD64Kz3_B9UBrHA+Akht8tZw@mail.gmail.com> (Stefan Beller's message of "Thu, 21 May 2015 15:08:30 -0700")

Stefan Beller <sbeller@google.com> writes:

> On Thu, May 21, 2015 at 1:03 PM, Philip Oakley <philipoakley@iee.org> 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.

>     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.

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?

  parent reply	other threads:[~2015-05-22 14:36 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-20 23:11 [PATCH] submodule documentation: Reorder introductory paragraphs Stefan Beller
2015-05-21 13:04 ` Heiko Voigt
2015-05-21 17:24 ` Junio C Hamano
2015-05-21 17:43   ` Stefan Beller
2015-05-21 20:03 ` Philip Oakley
2015-05-21 22:08   ` Stefan Beller
2015-05-22  6:59     ` Philip Oakley
2015-05-22 14:36     ` Junio C Hamano [this message]
2015-05-22 17:05       ` Stefan Beller
2015-05-22 17:26         ` Junio C Hamano
2015-05-22 17:35         ` Philip Oakley
2015-05-22 17:51           ` Stefan Beller
2015-05-22 19:47             ` Philip Oakley
  -- strict thread matches above, loose matches on Subject: below --
2015-05-22 19:38 Stefan Beller
2015-05-22 21:18 ` Philip Oakley
2015-05-25 22:00 ` Junio C Hamano
2015-05-26 17:53   ` Stefan Beller
2015-05-26 21:58     ` Heiko Voigt

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqwq00fzlv.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=hvoigt@hvoigt.net \
    --cc=jrnieder@gmail.com \
    --cc=pasky@suse.cz \
    --cc=philipoakley@iee.org \
    --cc=sbeller@google.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).