]> git.ipfire.org Git - thirdparty/git.git/commit - t/t3300-funny-names.sh
Merge branch 'js/branch-track-inherit'
authorJunio C Hamano <gitster@pobox.com>
Thu, 20 Jan 2022 23:25:38 +0000 (15:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Jan 2022 23:25:38 +0000 (15:25 -0800)
commit297ca895a27a6bbdb7906371d533f72a12ad25b2
tree22d57d4e9642379100ff6f8c216487287be46882
parent50b2d72e110cad39ecaf2322bfdf1b60cd13dd96
parent6327f0efed36c64d98a140110171362b7cb75a52
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
Documentation/git-branch.txt
Documentation/git-checkout.txt
builtin/branch.c
builtin/checkout.c