Merge branch 'so/glossary-ancestor'

Docfix.

* so/glossary-ancestor:
  glossary: substitute "ancestor" for "direct ancestor" in 'push' description.
This commit is contained in:
Junio C Hamano 2018-05-08 15:59:23 +09:00
commit c0bdbac449

View File

@ -463,7 +463,7 @@ exclude;;
[[def_push]]push:: [[def_push]]push::
Pushing a <<def_branch,branch>> means to get the branch's Pushing a <<def_branch,branch>> means to get the branch's
<<def_head_ref,head ref>> from a remote <<def_repository,repository>>, <<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 head ref, and in that case, putting all
objects, which are <<def_reachable,reachable>> from the local objects, which are <<def_reachable,reachable>> from the local
head ref, and which are missing from the remote head ref, and which are missing from the remote