{"thread":{"id":"48297","subject":"[PATCH] glossary: substitute \"ancestor\" for \"direct ancestor\" in 'push' description.","startedAt":"2018-04-16T05:43:23Z","lastAt":"2018-04-17T02:23:05Z","messageCount":2,"participants":["Sergey Organov","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"344775","messageId":"87muy31zbf.fsf@javad.com","threadId":"48297","inReplyTo":null,"subject":"[PATCH] glossary: substitute \"ancestor\" for \"direct ancestor\" in 'push' description.","fromName":"Sergey Organov","fromEmail":"sorganov@gmail.com","sentAt":"2018-04-16T05:43:16Z","receivedAt":"2018-04-16T05:43:23Z","isPatch":true,"sender":{"key":"sorganov@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8501568?v=4"},"body":"\nEven though \"direct ancestor\" is not defined in the glossary, the\ncommon meaning of the term is simply \"parent\", parents being the only\ndirect ancestors, and the rest of ancestors being indirect ancestors.\n\nAs \"parent\" is obviously wrong in this place in the description, we\nshould simply say \"ancestor\", as everywhere else.\n\nSigned-off-by: Sergey Organov <sorganov@gmail.com>\n---\n Documentation/glossary-content.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\nindex 6b8888d..6c2d23d 100644\n--- a/Documentation/glossary-content.txt\n+++ b/Documentation/glossary-content.txt\n@@ -463,7 +463,7 @@ exclude;;\n [[def_push]]push::\n \tPushing a <<def_branch,branch>> means to get the branch's\n \t<<def_head_ref,head ref>> from a remote <<def_repository,repository>>,\n-\tfind out if it is a direct ancestor to the branch's local\n+\tfind out if it is an ancestor to the branch's local\n \thead ref, and in that case, putting all\n \tobjects, which are <<def_reachable,reachable>> from the local\n \thead ref, and which are missing from the remote\n-- \n2.10.0.1.g57b01a3\n\n"},{"id":"344858","messageId":"xmqqwox6vaf2.fsf@gitster-ct.c.googlers.com","threadId":"48297","inReplyTo":"87muy31zbf.fsf@javad.com","subject":"Re: [PATCH] glossary: substitute \"ancestor\" for \"direct ancestor\" in 'push' description.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-04-17T02:22:57Z","receivedAt":"2018-04-17T02:23:05Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Sergey Organov <sorganov@gmail.com> writes:\n\n> Even though \"direct ancestor\" is not defined in the glossary, the\n> common meaning of the term is simply \"parent\", parents being the only\n> direct ancestors, and the rest of ancestors being indirect ancestors.\n\nMakes sense.  If there were distinction among parents of a single\nchild, perhaps a direct ancestor might be a term to refer to an\nancestor that is reached by following only the special kind of\nparent (rather than \"side\" ancestor that involves at least one hop\nof other lessor kind of parent), but there isn't anything like that\nin the system, so there is no need to use a confusing and undefined\nterm here in the documentation.\n\n> As \"parent\" is obviously wrong in this place in the description, we\n> should simply say \"ancestor\", as everywhere else.\n\nYup.  Great.\n\n>\n> Signed-off-by: Sergey Organov <sorganov@gmail.com>\n> ---\n>  Documentation/glossary-content.txt | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\n> index 6b8888d..6c2d23d 100644\n> --- a/Documentation/glossary-content.txt\n> +++ b/Documentation/glossary-content.txt\n> @@ -463,7 +463,7 @@ exclude;;\n>  [[def_push]]push::\n>  \tPushing a <<def_branch,branch>> means to get the branch's\n>  \t<<def_head_ref,head ref>> from a remote <<def_repository,repository>>,\n> -\tfind out if it is a direct ancestor to the branch's local\n> +\tfind out if it is an ancestor to the branch's local\n>  \thead ref, and in that case, putting all\n>  \tobjects, which are <<def_reachable,reachable>> from the local\n>  \thead ref, and which are missing from the remote\n"}]}