summaryrefslogtreecommitdiffstats
path: root/git-checkout.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-03-14 11:19:26 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-03-14 11:19:26 +0000
commit103ad7fa163b20b6629d6162e5b261a124e1e486 (patch)
tree4d3a9d38b101f57e14b36af1aa2c0190e16687a5 /git-checkout.html
parentc51fede9f2fdd66e06416d7865b023924b52e659 (diff)
downloadgit-htmldocs-103ad7fa163b20b6629d6162e5b261a124e1e486.tar.gz
Autogenerated HTML docs for v1.5.0.3-438-gc49b2
Diffstat (limited to 'git-checkout.html')
-rw-r--r--git-checkout.html27
1 files changed, 24 insertions, 3 deletions
diff --git a/git-checkout.html b/git-checkout.html
index 843465cba..05a675a51 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -273,7 +273,7 @@ git-checkout(1) Manual Page
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-checkout</em> [-q] [-f] [-b &lt;new_branch&gt; [-l]] [-m] [&lt;branch&gt;]
+<div class="content"><em>git-checkout</em> [-q] [-f] [-b [--track | --no-track] &lt;new_branch&gt; [-l]] [-m] [&lt;branch&gt;]
<em>git-checkout</em> [&lt;tree-ish&gt;] &lt;paths&gt;&#8230;</div></div>
</div>
<h2>DESCRIPTION</h2>
@@ -282,7 +282,8 @@ git-checkout(1) Manual Page
updating the index and working tree to reflect the specified
branch, &lt;branch&gt;, and updating HEAD to be &lt;branch&gt; or, if
specified, &lt;new_branch&gt;. Using -b will cause &lt;new_branch&gt; to
-be created.</p>
+be created; in this case you can use the --track or --no-track
+options, which will be passed to <tt>git branch</tt>.</p>
<p>When &lt;paths&gt; are given, this command does <strong>not</strong> switch
branches. It updates the named paths in the working tree from
the index file (i.e. it runs <tt>git-checkout-index -f -u</tt>), or a
@@ -324,6 +325,26 @@ working tree.</p>
</p>
</dd>
<dt>
+--track
+</dt>
+<dd>
+<p>
+ When -b is given and a branch is created off a remote branch,
+ setup so that git-pull will automatically retrieve data from
+ the remote branch.
+</p>
+</dd>
+<dt>
+--no-track
+</dt>
+<dd>
+<p>
+ When -b is given and a branch is created off a remote branch,
+ force that git-pull will automatically retrieve data from
+ the remote branch independent of the configuration settings.
+</p>
+</dd>
+<dt>
-l
</dt>
<dd>
@@ -511,7 +532,7 @@ $ git add frotz</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 18-Feb-2007 00:34:40 UTC
+Last updated 14-Mar-2007 11:19:09 UTC
</div>
</div>
</body>