From a279b74c685f57217ee0bb58faf113607ef67129 Mon Sep 17 00:00:00 2001 From: Sergey Organov Date: Mon, 16 Apr 2018 08:43:16 +0300 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/glossary-content.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') 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 <> means to get the branch's <> from a remote <>, - 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 <> from the local head ref, and which are missing from the remote -- cgit v1.2.3