diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-02-12 03:18:52 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-02-12 03:18:52 +0000 |
| commit | 9c33415fc305e37bd5a1f399bae1c3b9e2559571 (patch) | |
| tree | d062fd43e7c3a543176e5d390ac730c6b2a99b5c /git-checkout.html | |
| parent | 49dccafcce2c8a846416d30bc7cac6a72d67c102 (diff) | |
| download | git-htmldocs-9c33415fc305e37bd5a1f399bae1c3b9e2559571.tar.gz | |
Autogenerated HTML docs for v1.5.4.1-97-g40aab
Diffstat (limited to 'git-checkout.html')
| -rw-r--r-- | git-checkout.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/git-checkout.html b/git-checkout.html index 06b86e1c8..83420b046 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -334,10 +334,11 @@ working tree.</p> set up configuration so that git-pull will automatically
retrieve data from the remote branch. Use this if you always
pull from the same remote branch into the new branch, or if you
- don't want to use "git pull <repository> <refspec>" explicitly. Set the
- branch.autosetupmerge configuration variable to true if you
+ don't want to use "git pull <repository> <refspec>" explicitly.
+ This behavior is the default. Set the
+ branch.autosetupmerge configuration variable to false if you
want git-checkout and git-branch to always behave as if
- <em>--track</em> were given.
+ <em>--no-track</em> were given.
</p>
</dd>
<dt>
@@ -540,7 +541,7 @@ $ git add frotz</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 07-Jan-2008 07:50:05 UTC
+Last updated 12-Feb-2008 03:18:04 UTC
</div>
</div>
</body>
|