{"thread":{"id":"39461","subject":"[PATCH] glossary: add \"remote\", \"submodule\", \"superproject\"","startedAt":"2015-05-29T18:23:56Z","lastAt":"2015-05-29T18:23:56Z","messageCount":1,"participants":["Stefan Beller"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"262445","messageId":"1432923836-9939-1-git-send-email-sbeller@google.com","threadId":"39461","inReplyTo":null,"subject":"[PATCH] glossary: add \"remote\", \"submodule\", \"superproject\"","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2015-05-29T18:23:56Z","receivedAt":"2015-05-29T18:23:56Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"Noticed-by: Philip Oakley <philipoakley@iee.org>\nHelped-by: Junio C Hamano <gitster@pobox.com>\nSigned-off-by: Stefan Beller <sbeller@google.com>\n---\n\nMoved information regarding the superproject from submodule to superproject,\nand slightly reworded the superproject description.\n\n Documentation/glossary-content.txt | 16 ++++++++++++++++\n 1 file changed, 16 insertions(+)\n\ndiff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\nindex bf383c2..ab18f4b 100644\n--- a/Documentation/glossary-content.txt\n+++ b/Documentation/glossary-content.txt\n@@ -469,6 +469,11 @@ The most notable example is `HEAD`.\n \t<<def_push,push>> to describe the mapping between remote\n \t<<def_ref,ref>> and local ref.\n \n+[[def_remote]]remote repository::\n+\tA <<def_repository,repository>> which is used to track the same\n+\tproject but resides somewhere else. To communicate with remotes,\n+\tsee <<def_fetch,fetch>> or <<def_push,push>>.\n+\n [[def_remote_tracking_branch]]remote-tracking branch::\n \tA <<def_ref,ref>> that is used to follow changes from another\n \t<<def_repository,repository>>. It typically looks like\n@@ -515,6 +520,17 @@ The most notable example is `HEAD`.\n \tis created by giving the `--depth` option to linkgit:git-clone[1], and\n \tits history can be later deepened with linkgit:git-fetch[1].\n \n+[[def_submodule]]submodule::\n+\tA <<def_repository,repository>> that holds the history of a\n+\tseparate project inside another repository (the latter of\n+\twhich is called <<def_superproject, superproject>>).\n+\n+[[def_superproject]]superproject::\n+\tA <<def_repository,repository>> that references repositories\n+\tof other projects in its working tree as <<def_submodule,submodules>>.\n+\tThe superproject knows about the names of (but does not hold\n+\tcopies of) commit objects of the contained submodules.\n+\n [[def_symref]]symref::\n \tSymbolic reference: instead of containing the <<def_SHA1,SHA-1>>\n \tid itself, it is of the format 'ref: refs/some/thing' and when\n-- \n2.4.1.345.gab207b6.dirty\n"}]}