From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, philipoakley@iee.org, hvoigt@hvoigt.net,
Stefan Beller <sbeller@google.com>
Subject: [PATCH] glossary: add "remote", "submodule", "superproject"
Date: Wed, 27 May 2015 18:50:01 -0700 [thread overview]
Message-ID: <1432777801-6073-1-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <CAGZ79kauSsZK3_X+zTwL8TKuZiHNMGvMZfoCemW9-K7RWgrgCA@mail.gmail.com>
Noticed-by: Philip Oakley <philipoakley@iee.org>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
Documentation/glossary-content.txt | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index bf383c2..23ab692 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -469,6 +469,11 @@ The most notable example is `HEAD`.
<<def_push,push>> to describe the mapping between remote
<<def_ref,ref>> and local ref.
+[[def_remote]]remote repository::
+ A <<def_repository,repository>> which is used to track the same
+ project but resides somewhere else. To communicate with remotes,
+ see <<def_fetch,fetch>> or <<def_push,push>>.
+
[[def_remote_tracking_branch]]remote-tracking branch::
A <<def_ref,ref>> that is used to follow changes from another
<<def_repository,repository>>. It typically looks like
@@ -515,6 +520,18 @@ The most notable example is `HEAD`.
is created by giving the `--depth` option to linkgit:git-clone[1], and
its history can be later deepened with linkgit:git-fetch[1].
+[[def_submodule]]submodule::
+ A <<def_repository,repository>> that holds the history of a
+ separate project inside another repository (the latter of
+ which is called <<def_superproject, superproject>>). The
+ containing superproject knows about the names of (but does
+ not hold copies of) commit objects of the contained submodules.
+
+[[def_superproject]]superproject::
+ A <<def_repository,repository>> that references other repositories
+ inside itself as <<def_submodule,submodules>>. The superproject
+ tracks only the remote and the name of the submodule.
+
[[def_symref]]symref::
Symbolic reference: instead of containing the <<def_SHA1,SHA-1>>
id itself, it is of the format 'ref: refs/some/thing' and when
--
2.4.1.345.gab207b6.dirty
next prev parent reply other threads:[~2015-05-28 1:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-27 21:13 [PATCH] glossary: add "remote" and "submodule" Stefan Beller
2015-05-27 22:29 ` Junio C Hamano
2015-05-27 22:59 ` Stefan Beller
2015-05-27 23:05 ` Junio C Hamano
2015-05-27 23:29 ` Stefan Beller
2015-05-28 1:50 ` Stefan Beller [this message]
2015-05-28 16:45 ` [PATCH] glossary: add "remote", "submodule", "superproject" Junio C Hamano
2015-05-28 17:52 ` Stefan Beller
2015-05-28 18:50 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2015-05-29 18:23 Stefan Beller
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=1432777801-6073-1-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=philipoakley@iee.org \
/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).