aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-checkout.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-01-20 15:25:38 -0800
committerJunio C Hamano <gitster@pobox.com>2022-01-20 15:25:38 -0800
commit297ca895a27a6bbdb7906371d533f72a12ad25b2 (patch)
tree22d57d4e9642379100ff6f8c216487287be46882 /Documentation/git-checkout.txt
parent50b2d72e110cad39ecaf2322bfdf1b60cd13dd96 (diff)
parent6327f0efed36c64d98a140110171362b7cb75a52 (diff)
downloadgit-297ca895a27a6bbdb7906371d533f72a12ad25b2.tar.gz
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
Diffstat (limited to 'Documentation/git-checkout.txt')
-rw-r--r--Documentation/git-checkout.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 2a90ea6cd0..9f37e22e13 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -156,7 +156,7 @@ of it").
linkgit:git-branch[1] for details.
-t::
---track [direct|inherit]::
+--track[=(direct|inherit)]::
When creating a new branch, set up "upstream" configuration. See
"--track" in linkgit:git-branch[1] for details.
+