From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Aug 2021 21:06:39 +0000 (-0700)
Subject: Merge branch 'jk/config-env-doc'
X-Git-Tag: v2.33.0-rc0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a9b455146a9b8ee16cc6aef0b33864ea502e7a9;p=thirdparty%2Fgit.git

Merge branch 'jk/config-env-doc'

Documentation around GIT_CONFIG has been updated.

* jk/config-env-doc:
  doc/git-config: simplify "override" advice for FILES section
  doc/git-config: clarify GIT_CONFIG environment variable
  doc/git-config: explain --file instead of referring to GIT_CONFIG
---

5a9b455146a9b8ee16cc6aef0b33864ea502e7a9