diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
commit | fce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch) | |
tree | ffce2ae419b52786a0e567f4fddaadd89016f62c /git-checkout.html | |
parent | bb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff) | |
download | git-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz |
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'git-checkout.html')
-rw-r--r-- | git-checkout.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/git-checkout.html b/git-checkout.html index bfad47f73..8765bef7c 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -273,8 +273,8 @@ git-checkout(1) Manual Page <h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-checkout</em> [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>]
-<em>git-checkout</em> [<tree-ish>] <paths>…</div></div>
+<div class="content"><em>git checkout</em> [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>]
+<em>git checkout</em> [<tree-ish>] <paths>…</div></div>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -286,7 +286,7 @@ 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 <paths> 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
+the index file (i.e. it runs <tt>git checkout-index -f -u</tt>), or
from a named commit. In
this case, the <tt>-f</tt> and <tt>-b</tt> options are meaningless and giving
either of them results in an error. <tree-ish> argument can be
@@ -333,14 +333,14 @@ working tree.</p> </dt>
<dd>
<p>
- When creating a new branch, set up configuration so that git-pull
+ When creating a new branch, set up configuration so that <tt>git-pull</tt>
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
+ <tt>git-checkout</tt> and <tt>git-branch</tt> 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>
@@ -418,7 +418,7 @@ version 1.5.0, the above command <em>detaches</em> your HEAD from the current branch and directly point at the commit named by the tag
(<tt>v2.6.18</tt> in the above example).</p>
<p>You can use usual git commands while in this state. You can use
-<tt>git-reset --hard $othercommit</tt> to further move around, for
+<tt>git reset --hard $othercommit</tt> to further move around, for
example. You can make changes and create a new commit on top of
a detached HEAD. You can even create a merge by using <tt>git
merge $othercommit</tt>.</p>
@@ -542,7 +542,7 @@ $ git add frotz</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 22:46:22 UTC
+Last updated 02-Jul-2008 03:01:34 UTC
</div>
</div>
</body>
|