summaryrefslogtreecommitdiffstats
path: root/git-checkout.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-07-09 08:48:38 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-07-09 08:48:38 +0000
commit2a8f6dc6412a0d8c340c73f42533e1d1c5a98118 (patch)
tree57fb06e5707b6f641e200241da721bb6d7af0060 /git-checkout.txt
parent7a4a283105c6ac21fcd7df88cf6a698281c2cd19 (diff)
downloadgit-htmldocs-2a8f6dc6412a0d8c340c73f42533e1d1c5a98118.tar.gz
Autogenerated HTML docs for v1.5.3-rc0-81-g1ed84
Diffstat (limited to 'git-checkout.txt')
-rw-r--r--git-checkout.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-checkout.txt b/git-checkout.txt
index 818b720b9..82929523c 100644
--- a/git-checkout.txt
+++ b/git-checkout.txt
@@ -52,8 +52,9 @@ OPTIONS
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.
+ want git-checkout and git-branch to behave as if
+ '--track' were given when you branch from a remote
+ tracking branch.
--no-track::
When -b is given and a branch is created off a remote branch,