From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 20 Jan 2022 23:25:38 +0000 (-0800)
Subject: Merge branch 'js/branch-track-inherit'
X-Git-Tag: v2.35.0~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=297ca895a27a6bbdb7906371d533f72a12ad25b2;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.
source: <3de40324bea6a1dd9bca2654721471e3809e87d8.1642538935.git.steadmon@google.com>
source: <c3c26192-aee9-185a-e559-b8735139e49c@web.de>

* js/branch-track-inherit:
  branch,checkout: fix --track documentation
---

297ca895a27a6bbdb7906371d533f72a12ad25b2