@matheusbsbs / matheus-bagliano / commits / b71083043c
Fork 0

Documentation: clarify track/no-track option.

Fix the description of the --no-track option so it no longer says the opposite of what was intended. Also mention branch.autosetupmerge explicitly. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>

J. Bruce Fields committed Apr 16, 2007 at 00:37 UTC b71083043c66b241713ff0698f113eb7c8bc9a90
1 file changed +8 -4
Documentation/git-checkout.txt
+8 -4
@@ -49,13 +49,17 @@ OPTIONS
49
50 --track::
51 When -b is given and a branch is created off a remote branch,
52 - setup so that git-pull will automatically retrieve data from
53 - the remote branch.
52 + set up configuration so that git-pull will automatically
53 + retrieve data from the remote branch. Set the
54 + branch.autosetupmerge configuration variable to true if you
55 + want git-checkout and git-branch to always behave as if
56 + '--track' were given.
57
58 --no-track::
59 When -b is given and a branch is created off a remote branch,
57 - force that git-pull will automatically retrieve data from
58 - the remote branch independent of the configuration settings.
60 + set up configuration so that git-pull will not retrieve data
61 + from the remote branch, ignoring the branch.autosetupmerge
62 + configuration variable.
63
64 -l::
65 Create the new branch's ref log. This activates recording of