From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Jan 2022 00:02:23 +0000 (-0800)
Subject: Merge branch 'js/branch-track-inherit'
X-Git-Tag: v2.35.0-rc2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af4e5f569bc89f356eb34a9373d7f82aca6faa8a;p=thirdparty%2Fgit.git

Merge branch 'js/branch-track-inherit'

"git branch -h" incorrectly said "--track[=direct|inherit]",
implying that "--trackinherit" is a valid option, which has been
corrected.

* js/branch-track-inherit:
  branch,checkout: fix --track usage strings
---

af4e5f569bc89f356eb34a9373d7f82aca6faa8a