From: Sergey Organov <sorganov@gmail.com>
Date: Mon, 16 Apr 2018 05:43:16 +0000 (+0300)
Subject: glossary: substitute "ancestor" for "direct ancestor" in 'push' description.
X-Git-Tag: v2.18.0-rc0~94^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a279b74c685f57217ee0bb58faf113607ef67129?ds=inline;hp=-c

glossary: substitute "ancestor" for "direct ancestor" in 'push' description.

Even though "direct ancestor" is not defined in the glossary, the
common meaning of the term is simply "parent", parents being the only
direct ancestors, and the rest of ancestors being indirect ancestors.

As "parent" is obviously wrong in this place in the description, we
should simply say "ancestor", as everywhere else.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

a279b74c685f57217ee0bb58faf113607ef67129
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 6b8888d123..6c2d23dc48 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -463,7 +463,7 @@ exclude;;
 [[def_push]]push::
 	Pushing a <<def_branch,branch>> means to get the branch's
 	<<def_head_ref,head ref>> from a remote <<def_repository,repository>>,
-	find out if it is a direct ancestor to the branch's local
+	find out if it is an ancestor to the branch's local
 	head ref, and in that case, putting all
 	objects, which are <<def_reachable,reachable>> from the local
 	head ref, and which are missing from the remote