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

Doc clean-up. * fc/doc-default-to-upstream-config: doc: merge: mention default of defaulttoupstream

Junio C Hamano committed Jul 8, 2021 at 13:14 UTC 11fac260fe6192cfeb877cf560531e50e1ea2025

No changes.