diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-02-28 00:27:44 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-02-28 00:27:44 +0000 |
| commit | 24bc09a2408f779de87b173b93386f5d1cbeee34 (patch) | |
| tree | fed4584ad7fba36e609ec2ad9eed33fc9aee2c1d /git-checkout.html | |
| parent | 69f491759956153218a1ac862629c439a194d865 (diff) | |
| download | git-htmldocs-24bc09a2408f779de87b173b93386f5d1cbeee34.tar.gz | |
Autogenerated HTML docs for v1.5.4.3-325-g6d21
Diffstat (limited to 'git-checkout.html')
| -rw-r--r-- | git-checkout.html | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/git-checkout.html b/git-checkout.html index 83420b046..e5a74dd67 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -330,15 +330,16 @@ working tree.</p> </dt>
<dd>
<p>
- When -b is given and a branch is created off a remote branch,
- 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.
- 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>--no-track</em> were given.
+ When creating a new branch, set up configuration so that git-pull
+ will automatically retrieve data from the start point, which must be
+ a branch. Use this if you always pull from the same upstream branch
+ into the new branch, and if you don't want to use "git pull
+ <repository> <refspec>" explicitly. This behavior is the default
+ when the start point is a remote branch. Set the
+ branch.autosetupmerge configuration variable to <tt>false</tt> if you want
+ git-checkout and git-branch to always behave as if <em>--no-track</em> were
+ given. Set it to <tt>always</tt> if you want this behavior when the
+ start-point is either a local or remote branch.
</p>
</dd>
<dt>
@@ -346,10 +347,7 @@ working tree.</p> </dt>
<dd>
<p>
- When -b is given and a branch is created off a remote branch,
- set up configuration so that git-pull will not retrieve data
- from the remote branch, ignoring the branch.autosetupmerge
- configuration variable.
+ Ignore the branch.autosetupmerge configuration variable.
</p>
</dd>
<dt>
@@ -541,7 +539,7 @@ $ git add frotz</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 12-Feb-2008 03:18:04 UTC
+Last updated 28-Feb-2008 00:25:37 UTC
</div>
</div>
</body>
|