git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
* [PATCH] glossary: substitute "ancestor" for "direct ancestor" in 'push' description.
@ 2018-04-16  5:43 Sergey Organov
  2018-04-17  2:22 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Sergey Organov @ 2018-04-16  5:43 UTC (permalink / raw)
  To: git; +Cc: gitster


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>
---
 Documentation/glossary-content.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 6b8888d..6c2d23d 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
-- 
2.10.0.1.g57b01a3


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] glossary: substitute "ancestor" for "direct ancestor" in 'push' description.
  2018-04-16  5:43 [PATCH] glossary: substitute "ancestor" for "direct ancestor" in 'push' description Sergey Organov
@ 2018-04-17  2:22 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2018-04-17  2:22 UTC (permalink / raw)
  To: Sergey Organov; +Cc: git

Sergey Organov <sorganov@gmail.com> writes:

> 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.

Makes sense.  If there were distinction among parents of a single
child, perhaps a direct ancestor might be a term to refer to an
ancestor that is reached by following only the special kind of
parent (rather than "side" ancestor that involves at least one hop
of other lessor kind of parent), but there isn't anything like that
in the system, so there is no need to use a confusing and undefined
term here in the documentation.

> As "parent" is obviously wrong in this place in the description, we
> should simply say "ancestor", as everywhere else.

Yup.  Great.

>
> Signed-off-by: Sergey Organov <sorganov@gmail.com>
> ---
>  Documentation/glossary-content.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
> index 6b8888d..6c2d23d 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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-16  5:43 [PATCH] glossary: substitute "ancestor" for "direct ancestor" in 'push' description Sergey Organov
2018-04-17  2:22 ` Junio C Hamano

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox