Skip to content

Commit a279b74

Browse files
sorganovgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent fe0a9ea commit a279b74

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/glossary-content.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ exclude;;
463463
[[def_push]]push::
464464
Pushing a <<def_branch,branch>> means to get the branch's
465465
<<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
467467
head ref, and in that case, putting all
468468
objects, which are <<def_reachable,reachable>> from the local
469469
head ref, and which are missing from the remote

0 commit comments

Comments
 (0)