summaryrefslogtreecommitdiffstats
path: root/git-checkout.html
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.html
parent7a4a283105c6ac21fcd7df88cf6a698281c2cd19 (diff)
downloadgit-htmldocs-2a8f6dc6412a0d8c340c73f42533e1d1c5a98118.tar.gz
Autogenerated HTML docs for v1.5.3-rc0-81-g1ed84
Diffstat (limited to 'git-checkout.html')
-rw-r--r--git-checkout.html7
1 files changed, 4 insertions, 3 deletions
diff --git a/git-checkout.html b/git-checkout.html
index 43989db03..ac5f81603 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -334,8 +334,9 @@ working tree.</p>
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
- <em>--track</em> were given.
+ want git-checkout and git-branch to behave as if
+ <em>--track</em> were given when you branch from a remote
+ tracking branch.
</p>
</dd>
<dt>
@@ -538,7 +539,7 @@ $ git add frotz</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 03-Jul-2007 07:03:39 UTC
+Last updated 09-Jul-2007 08:47:47 UTC
</div>
</div>
</body>