]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'js/branch-track-inherit'
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Jan 2022 00:02:23 +0000 (16:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Jan 2022 00:02:23 +0000 (16:02 -0800)
commitaf4e5f569bc89f356eb34a9373d7f82aca6faa8a
tree69f19624038868409ede5c502a28bc84af2869f5
parent0330edb239c2482739329f5182de89a9580868ad
parent15f002812f858b49ce7641eb191561843cf31f00
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
builtin/branch.c
builtin/checkout.c