Merge branch 'so/glossary-ancestor'

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

Junio C Hamano committed May 8, 2018 at 15:59 UTC c0bdbac449e8f2ca8fb9a3da2700d0ea1dfb636e

No changes.