From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 31 Jan 2022 18:37:44 +0000 (-0800)
Subject: Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules
X-Git-Tag: v2.36.0-rc0~131^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09e0be130d83ceedb3653d9a41768c6a13457ac5;p=thirdparty%2Fgit.git

Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules

* js/branch-track-inherit:
  branch,checkout: fix --track documentation
  branch,checkout: fix --track usage strings
  config: require lowercase for branch.*.autosetupmerge
  branch: add flags and config to inherit tracking
  branch: accept multiple upstream branches for tracking
---

09e0be130d83ceedb3653d9a41768c6a13457ac5