Merge branch 'fc/doc-default-to-upstream-config' into jch
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2021 02:26:18 +0000 (11:26 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2021 02:26:18 +0000 (11:26 +0900)
commit5f7b8ac6f11f9020c6082f5f5919ed974322bd11
tree0c3b84251a0c7f855117095d7aa4951d705a8c05
parent0154f4d6a929351b97cf4365627c56e20525fd2d
parent8603c419d3b7619b9958541461eb024c767cf212
Merge branch 'fc/doc-default-to-upstream-config' into jch

Doc clean-up.

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