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>
Sergey Organov committed
Apr 16, 2018 at 08:43 UTC
a279b74c685f57217ee0bb58faf113607ef67129
1 file changed
+1
-1
Documentation/glossary-content.txt
+1
-1
@@ -463,7 +463,7 @@ exclude;;
463
[[def_push]]push::
464
Pushing a <<def_branch,branch>> means to get the branch's
465
<<def_head_ref,head ref>> from a remote <<def_repository,repository>>,
466
- find out if it is a direct ancestor to the branch's local
466
+ find out if it is an ancestor to the branch's local
467
head ref, and in that case, putting all
468
objects, which are <<def_reachable,reachable>> from the local
469
head ref, and which are missing from the remote