Merge branch 'so/glossary-ancestor'
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 06:59:23 +0000 (15:59 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 06:59:23 +0000 (15:59 +0900)
Docfix.

* so/glossary-ancestor:
  glossary: substitute "ancestor" for "direct ancestor" in 'push' description.


Trivial merge