From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 Jul 2021 20:14:57 +0000 (-0700)
Subject: Merge branch 'fc/doc-default-to-upstream-config'
X-Git-Tag: v2.33.0-rc0~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11fac260fe6192cfeb877cf560531e50e1ea2025;p=thirdparty%2Fgit.git

Merge branch 'fc/doc-default-to-upstream-config'

Doc clean-up.

* fc/doc-default-to-upstream-config:
  doc: merge: mention default of defaulttoupstream
---

11fac260fe6192cfeb877cf560531e50e1ea2025