diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2007-04-16 00:37:12 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-16 01:10:28 -0700 |
| commit | b71083043c66b241713ff0698f113eb7c8bc9a90 (patch) | |
| tree | 24e6051bec85b2409cde7c9a3132a5be0089a9ae /Documentation/git-checkout.txt | |
| parent | 40c8279f9b4f1c37f5e994c1c053b69446133559 (diff) | |
| download | git-b71083043c66b241713ff0698f113eb7c8bc9a90.tar.gz git-b71083043c66b241713ff0698f113eb7c8bc9a90.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-checkout.txt')
| -rw-r--r-- | Documentation/git-checkout.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index b889688b4..4f2e847dc 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -49,13 +49,17 @@ OPTIONS --track:: When -b is given and a branch is created off a remote branch, - setup so that git-pull will automatically retrieve data from - the remote branch. + set up configuration so that git-pull will automatically + 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:: When -b is given and a branch is created off a remote branch, - force that git-pull will automatically retrieve data from - the remote branch independent of the configuration settings. + set up configuration so that git-pull will not retrieve data + from the remote branch, ignoring the branch.autosetupmerge + configuration variable. -l:: Create the new branch's ref log. This activates recording of |