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

Docfix.

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