From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 May 2018 06:59:23 +0000 (+0900)
Subject: Merge branch 'so/glossary-ancestor'
X-Git-Tag: v2.18.0-rc0~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0bdbac449e8f2ca8fb9a3da2700d0ea1dfb636e;p=thirdparty%2Fgit.git

Merge branch 'so/glossary-ancestor'

Docfix.

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

c0bdbac449e8f2ca8fb9a3da2700d0ea1dfb636e