mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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>
This commit is contained in:
parent
40c8279f9b
commit
b71083043c
|
@ -49,13 +49,17 @@ OPTIONS
|
||||||
|
|
||||||
--track::
|
--track::
|
||||||
When -b is given and a branch is created off a remote branch,
|
When -b is given and a branch is created off a remote branch,
|
||||||
setup so that git-pull will automatically retrieve data from
|
set up configuration so that git-pull will automatically
|
||||||
the remote branch.
|
retrieve data from the remote branch. Set the
|
||||||
|
branch.autosetupmerge configuration variable to true if you
|
||||||
|
want git-checkout and git-branch to always behave as if
|
||||||
|
'--track' were given.
|
||||||
|
|
||||||
--no-track::
|
--no-track::
|
||||||
When -b is given and a branch is created off a remote branch,
|
When -b is given and a branch is created off a remote branch,
|
||||||
force that git-pull will automatically retrieve data from
|
set up configuration so that git-pull will not retrieve data
|
||||||
the remote branch independent of the configuration settings.
|
from the remote branch, ignoring the branch.autosetupmerge
|
||||||
|
configuration variable.
|
||||||
|
|
||||||
-l::
|
-l::
|
||||||
Create the new branch's ref log. This activates recording of
|
Create the new branch's ref log. This activates recording of
|
||||||
|
|
Loading…
Reference in a new issue