diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:23 +0900 |
| commit | c0bdbac449e8f2ca8fb9a3da2700d0ea1dfb636e (patch) | |
| tree | 12d81309e4c60bd20bef4c9fb374729472831a77 /Documentation | |
| parent | Merge branch 'ls/checkout-encoding' (diff) | |
| parent | glossary: substitute "ancestor" for "direct ancestor" in 'push' description. (diff) | |
| download | tgif-c0bdbac449e8f2ca8fb9a3da2700d0ea1dfb636e.tar.xz | |
Merge branch 'so/glossary-ancestor'
Docfix.
* so/glossary-ancestor:
glossary: substitute "ancestor" for "direct ancestor" in 'push' description.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/glossary-content.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 |