summaryrefslogtreecommitdiffstats
path: root/git-checkout.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-07-12 06:45:37 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-07-12 06:45:37 +0000
commit9cb3917f7e52cd927c582c4aa754a6855297303d (patch)
tree91f32811fd576e10603b3b2a741701ea37515b24 /git-checkout.html
parent06216df5d478e655f4d835b8777e85dffa8bed99 (diff)
downloadgit-htmldocs-9cb3917f7e52cd927c582c4aa754a6855297303d.tar.gz
Autogenerated HTML docs for v1.5.3-rc0-101-gd972c
Diffstat (limited to 'git-checkout.html')
-rw-r--r--git-checkout.html7
1 files changed, 3 insertions, 4 deletions
diff --git a/git-checkout.html b/git-checkout.html
index ac5f81603..a400d6f6c 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -334,9 +334,8 @@ 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 behave as if
- <em>--track</em> were given when you branch from a remote
- tracking branch.
+ want git-checkout and git-branch to always behave as if
+ <em>--track</em> were given.
</p>
</dd>
<dt>
@@ -539,7 +538,7 @@ $ git add frotz</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 09-Jul-2007 08:47:47 UTC
+Last updated 12-Jul-2007 06:45:15 UTC
</div>
</div>
</body>