From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Sep 2020 19:37:09 +0000 (-0700)
Subject: Merge branch 'pb/doc-external-diff-env'
X-Git-Tag: v2.29.0-rc0~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd332b2a319f00db18b91201cc9a6fafc6adf649;p=thirdparty%2Fgit.git

Merge branch 'pb/doc-external-diff-env'

Doc update.

* pb/doc-external-diff-env:
  git.txt: correct stale 'GIT_EXTERNAL_DIFF' description
---

cd332b2a319f00db18b91201cc9a6fafc6adf649