Google Git
Sign in
chromium / external / gitster / git-htmldocs / ac53020a437dd8086a64cf7d6c673e0a8f5a119c / . / git-checkout.html
blob: 1cb4910599b97e723a4cd58d419ffcccc40e8bf1 [file] [log] [blame]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.4.5" />
<title>git-checkout(1)</title>
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
/*
border: 1px solid red;
*/
}
body {
margin: 1em 5% 1em 5%;
}
a {
color: blue;
text-decoration: underline;
}
a:visited {
color: fuchsia;
}
em {
font-style: italic;
color: navy;
}
strong {
font-weight: bold;
color: #083194;
}
tt {
color: navy;
}
h1, h2, h3, h4, h5, h6 {
color: #527bbd;
font-family: sans-serif;
margin-top: 1.2em;
margin-bottom: 0.5em;
line-height: 1.3;
}
h1, h2, h3 {
border-bottom: 2px solid silver;
}
h2 {
padding-top: 0.5em;
}
h3 {
float: left;
}
h3 + * {
clear: left;
}
div.sectionbody {
font-family: serif;
margin-left: 0;
}
hr {
border: 1px solid silver;
}
p {
margin-top: 0.5em;
margin-bottom: 0.5em;
}
ul, ol, li > p {
margin-top: 0;
}
pre {
padding: 0;
margin: 0;
}
span#author {
color: #527bbd;
font-family: sans-serif;
font-weight: bold;
font-size: 1.1em;
}
span#email {
}
span#revnumber, span#revdate, span#revremark {
font-family: sans-serif;
}
div#footer {
font-family: sans-serif;
font-size: small;
border-top: 2px solid silver;
padding-top: 0.5em;
margin-top: 4.0em;
}
div#footer-text {
float: left;
padding-bottom: 0.5em;
}
div#footer-badges {
float: right;
padding-bottom: 0.5em;
}
div#preamble {
margin-top: 1.5em;
margin-bottom: 1.5em;
}
div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
margin-top: 1.5em;
margin-bottom: 1.5em;
}
div.admonitionblock {
margin-top: 2.5em;
margin-bottom: 2.5em;
}
div.content { /* Block element content. */
padding: 0;
}
/* Block element titles. */
div.title, caption.title {
color: #527bbd;
font-family: sans-serif;
font-weight: bold;
text-align: left;
margin-top: 1.0em;
margin-bottom: 0.5em;
}
div.title + * {
margin-top: 0;
}
td div.title:first-child {
margin-top: 0.0em;
}
div.content div.title:first-child {
margin-top: 0.0em;
}
div.content + div.title {
margin-top: 0.0em;
}
div.sidebarblock > div.content {
background: #ffffee;
border: 1px solid silver;
padding: 0.5em;
}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
padding: 0.5em;
}
div.quoteblock {
padding-left: 2.0em;
margin-right: 10%;
}
div.quoteblock > div.attribution {
padding-top: 0.5em;
text-align: right;
}
div.verseblock {
padding-left: 2.0em;
margin-right: 10%;
}
div.verseblock > div.content {
white-space: pre;
}
div.verseblock > div.attribution {
padding-top: 0.75em;
text-align: left;
}
/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
div.verseblock + div.attribution {
text-align: left;
}
div.admonitionblock .icon {
vertical-align: top;
font-size: 1.1em;
font-weight: bold;
text-decoration: underline;
color: #527bbd;
padding-right: 0.5em;
}
div.admonitionblock td.content {
padding-left: 0.5em;
border-left: 2px solid silver;
}
div.exampleblock > div.content {
border-left: 2px solid silver;
padding: 0.5em;
}
div.imageblock div.content { padding-left: 0; }
span.image img { border-style: none; }
a.image:visited { color: white; }
dl {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
dt {
margin-top: 0.5em;
margin-bottom: 0;
font-style: normal;
color: navy;
}
dd > *:first-child {
margin-top: 0.1em;
}
ul, ol {
list-style-position: outside;
}
ol.arabic {
list-style-type: decimal;
}
ol.loweralpha {
list-style-type: lower-alpha;
}
ol.upperalpha {
list-style-type: upper-alpha;
}
ol.lowerroman {
list-style-type: lower-roman;
}
ol.upperroman {
list-style-type: upper-roman;
}
div.compact ul, div.compact ol,
div.compact p, div.compact p,
div.compact div, div.compact div {
margin-top: 0.1em;
margin-bottom: 0.1em;
}
div.tableblock > table {
border: 3px solid #527bbd;
}
thead {
font-family: sans-serif;
font-weight: bold;
}
tfoot {
font-weight: bold;
}
td > div.verse {
white-space: pre;
}
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
div.tableblock > table[frame="hsides"] {
border-left-style: none;
border-right-style: none;
}
div.tableblock > table[frame="vsides"] {
border-top-style: none;
border-bottom-style: none;
}
div.hdlist {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
div.hdlist tr {
padding-bottom: 15px;
}
dt.hdlist1.strong, td.hdlist1.strong {
font-weight: bold;
}
td.hdlist1 {
vertical-align: top;
font-style: normal;
padding-right: 0.8em;
color: navy;
}
td.hdlist2 {
vertical-align: top;
}
div.hdlist.compact tr {
margin: 0;
padding-bottom: 0;
}
.comment {
background: yellow;
}
@media print {
div#footer-badges { display: none; }
}
div#toctitle {
color: #527bbd;
font-family: sans-serif;
font-size: 1.1em;
font-weight: bold;
margin-top: 1.0em;
margin-bottom: 0.1em;
}
div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
margin-top: 0;
margin-bottom: 0;
}
div.toclevel2 {
margin-left: 2em;
font-size: 0.9em;
}
div.toclevel3 {
margin-left: 4em;
font-size: 0.9em;
}
div.toclevel4 {
margin-left: 6em;
font-size: 0.9em;
}
/* Overrides for manpage documents */
h1 {
padding-top: 0.5em;
padding-bottom: 0.5em;
border-top: 2px solid silver;
border-bottom: 2px solid silver;
}
h2 {
border-style: none;
}
div.sectionbody {
margin-left: 5%;
}
@media print {
div#toc { display: none; }
}
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
background: #ffffee;
border: 1px solid silver;
padding: 0.5em;
}
div.sidebar-title, div.image-title {
color: #527bbd;
font-family: sans-serif;
font-weight: bold;
margin-top: 0.0em;
margin-bottom: 0.5em;
}
div.listingblock div.content {
border: 1px solid silver;
background: #f4f4f4;
padding: 0.5em;
}
div.quoteblock-attribution {
padding-top: 0.5em;
text-align: right;
}
div.verseblock-content {
white-space: pre;
}
div.verseblock-attribution {
padding-top: 0.75em;
text-align: left;
}
div.exampleblock-content {
border-left: 2px solid silver;
padding-left: 0.5em;
}
/* IE6 sets dynamically generated links as visited. */
div#toc a:visited { color: blue; }
</style>
</head>
<body>
<div id="header">
<h1>
git-checkout(1) Manual Page
</h1>
<h2>NAME</h2>
<div class="sectionbody">
<p>git-checkout -
Checkout a branch or paths to the working tree
</p>
</div>
</div>
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
<div class="verseblock-content"><em>git checkout</em> [-q] [-f] [-m] [&lt;branch&gt;]
<em>git checkout</em> [-q] [-f] [-m] [--detach] [&lt;commit&gt;]
<em>git checkout</em> [-q] [-f] [-m] [[-b|-B|--orphan] &lt;new_branch&gt;] [&lt;start_point&gt;]
<em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=&lt;style&gt;] [&lt;tree-ish&gt;] [--] &lt;paths&gt;&#8230;
<em>git checkout</em> [-p|--patch] [&lt;tree-ish&gt;] [--] [&lt;paths&gt;&#8230;]</div>
<div class="verseblock-attribution">
</div></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>Updates files in the working tree to match the version in the index
or the specified tree. If no paths are given, <em>git checkout</em> will
also update <tt>HEAD</tt> to set the specified branch as the current
branch.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
<em>git checkout</em> [&lt;branch&gt;]
</dt>
<dt class="hdlist1">
<em>git checkout</em> -b|-B &lt;new_branch&gt; [&lt;start point&gt;]
</dt>
<dt class="hdlist1">
<em>git checkout</em> [--detach] [&lt;commit&gt;]
</dt>
<dd>
<p>
This form switches branches by updating the index, working
tree, and HEAD to reflect the specified branch or commit.
</p>
<div class="paragraph"><p>If <tt>-b</tt> is given, a new branch is created as if <a href="git-branch.html">git-branch(1)</a>
were called and then checked out; in this case you can
use the <tt>--track</tt> or <tt>--no-track</tt> options, which will be passed to
<em>git branch</em>. As a convenience, <tt>--track</tt> without <tt>-b</tt> implies branch
creation; see the description of <tt>--track</tt> below.</p></div>
<div class="paragraph"><p>If <tt>-B</tt> is given, &lt;new_branch&gt; is created if it doesn&#8217;t exist; otherwise, it
is reset. This is the transactional equivalent of</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git branch -f &lt;branch&gt; [&lt;start point&gt;]
$ git checkout &lt;branch&gt;</tt></pre>
</div></div>
<div class="paragraph"><p>that is to say, the branch is not reset/created unless "git checkout" is
successful.</p></div>
</dd>
<dt class="hdlist1">
<em>git checkout</em> [-p|--patch] [&lt;tree-ish&gt;] [--] &lt;pathspec&gt;&#8230;
</dt>
<dd>
<p>
When &lt;paths&gt; or <tt>--patch</tt> are given, <em>git checkout</em> does <strong>not</strong>
switch branches. It updates the named paths in the working tree
from the index file or from a named &lt;tree-ish&gt; (most often a
commit). In this case, the <tt>-b</tt> and <tt>--track</tt> options are
meaningless and giving either of them results in an error. The
&lt;tree-ish&gt; argument can be used to specify a specific tree-ish
(i.e. commit, tag or tree) to update the index for the given
paths before updating the working tree.
</p>
<div class="paragraph"><p>The index may contain unmerged entries because of a previous failed merge.
By default, if you try to check out such an entry from the index, the
checkout operation will fail and nothing will be checked out.
Using <tt>-f</tt> will ignore these unmerged entries. The contents from a
specific side of the merge can be checked out of the index by
using <tt>--ours</tt> or <tt>--theirs</tt>. With <tt>-m</tt>, changes made to the working tree
file can be discarded to re-create the original conflicted merge result.</p></div>
</dd>
</dl></div>
</div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
-q
</dt>
<dt class="hdlist1">
--quiet
</dt>
<dd>
<p>
Quiet, suppress feedback messages.
</p>
</dd>
<dt class="hdlist1">
-f
</dt>
<dt class="hdlist1">
--force
</dt>
<dd>
<p>
When switching branches, proceed even if the index or the
working tree differs from HEAD. This is used to throw away
local changes.
</p>
<div class="paragraph"><p>When checking out paths from the index, do not fail upon unmerged
entries; instead, unmerged entries are ignored.</p></div>
</dd>
<dt class="hdlist1">
--ours
</dt>
<dt class="hdlist1">
--theirs
</dt>
<dd>
<p>
When checking out paths from the index, check out stage #2
(<em>ours</em>) or #3 (<em>theirs</em>) for unmerged paths.
</p>
</dd>
<dt class="hdlist1">
-b
</dt>
<dd>
<p>
Create a new branch named &lt;new_branch&gt; and start it at
&lt;start_point&gt;; see <a href="git-branch.html">git-branch(1)</a> for details.
</p>
</dd>
<dt class="hdlist1">
-B
</dt>
<dd>
<p>
Creates the branch &lt;new_branch&gt; and start it at &lt;start_point&gt;;
if it already exists, then reset it to &lt;start_point&gt;. This is
equivalent to running "git branch" with "-f"; see
<a href="git-branch.html">git-branch(1)</a> for details.
</p>
</dd>
<dt class="hdlist1">
-t
</dt>
<dt class="hdlist1">
--track
</dt>
<dd>
<p>
When creating a new branch, set up "upstream" configuration. See
"--track" in <a href="git-branch.html">git-branch(1)</a> for details.
</p>
<div class="paragraph"><p>If no <em>-b</em> option is given, the name of the new branch will be
derived from the remote-tracking branch. If "remotes/" or "refs/remotes/"
is prefixed it is stripped away, and then the part up to the
next slash (which would be the nickname of the remote) is removed.
This would tell us to use "hack" as the local branch when branching
off of "origin/hack" (or "remotes/origin/hack", or even
"refs/remotes/origin/hack"). If the given name has no slash, or the above
guessing results in an empty name, the guessing is aborted. You can
explicitly give a name with <em>-b</em> in such a case.</p></div>
</dd>
<dt class="hdlist1">
--no-track
</dt>
<dd>
<p>
Do not set up "upstream" configuration, even if the
branch.autosetupmerge configuration variable is true.
</p>
</dd>
<dt class="hdlist1">
-l
</dt>
<dd>
<p>
Create the new branch&#8217;s reflog; see <a href="git-branch.html">git-branch(1)</a> for
details.
</p>
</dd>
<dt class="hdlist1">
--detach
</dt>
<dd>
<p>
Rather than checking out a branch to work on it, check out a
commit for inspection and discardable experiments.
This is the default behavior of "git checkout &lt;commit&gt;" when
&lt;commit&gt; is not a branch name. See the "DETACHED HEAD" section
below for details.
</p>
</dd>
<dt class="hdlist1">
--orphan
</dt>
<dd>
<p>
Create a new <em>orphan</em> branch, named &lt;new_branch&gt;, started from
&lt;start_point&gt; and switch to it. The first commit made on this
new branch will have no parents and it will be the root of a new
history totally disconnected from all the other branches and
commits.
</p>
<div class="paragraph"><p>The index and the working tree are adjusted as if you had previously run
"git checkout &lt;start_point&gt;". This allows you to start a new history
that records a set of paths similar to &lt;start_point&gt; by easily running
"git commit -a" to make the root commit.</p></div>
<div class="paragraph"><p>This can be useful when you want to publish the tree from a commit
without exposing its full history. You might want to do this to publish
an open source branch of a project whose current tree is "clean", but
whose full history contains proprietary or otherwise encumbered bits of
code.</p></div>
<div class="paragraph"><p>If you want to start a disconnected history that records a set of paths
that is totally different from the one of &lt;start_point&gt;, then you should
clear the index and the working tree right after creating the orphan
branch by running "git rm -rf ." from the top level of the working tree.
Afterwards you will be ready to prepare your new files, repopulating the
working tree, by copying them from elsewhere, extracting a tarball, etc.</p></div>
</dd>
<dt class="hdlist1">
-m
</dt>
<dt class="hdlist1">
--merge
</dt>
<dd>
<p>
When switching branches,
if you have local modifications to one or more files that
are different between the current branch and the branch to
which you are switching, the command refuses to switch
branches in order to preserve your modifications in context.
However, with this option, a three-way merge between the current
branch, your working tree contents, and the new branch
is done, and you will be on the new branch.
</p>
<div class="paragraph"><p>When a merge conflict happens, the index entries for conflicting
paths are left unmerged, and you need to resolve the conflicts
and mark the resolved paths with <tt>git add</tt> (or <tt>git rm</tt> if the merge
should result in deletion of the path).</p></div>
<div class="paragraph"><p>When checking out paths from the index, this option lets you recreate
the conflicted merge in the specified paths.</p></div>
</dd>
<dt class="hdlist1">
--conflict=&lt;style&gt;
</dt>
<dd>
<p>
The same as --merge option above, but changes the way the
conflicting hunks are presented, overriding the
merge.conflictstyle configuration variable. Possible values are
"merge" (default) and "diff3" (in addition to what is shown by
"merge" style, shows the original contents).
</p>
</dd>
<dt class="hdlist1">
-p
</dt>
<dt class="hdlist1">
--patch
</dt>
<dd>
<p>
Interactively select hunks in the difference between the
&lt;tree-ish&gt; (or the index, if unspecified) and the working
tree. The chosen hunks are then applied in reverse to the
working tree (and if a &lt;tree-ish&gt; was specified, the index).
</p>
<div class="paragraph"><p>This means that you can use <tt>git checkout -p</tt> to selectively discard
edits from your current working tree. See the &#8220;Interactive Mode&#8221;
section of <a href="git-add.html">git-add(1)</a> to learn how to operate the <tt>--patch</tt> mode.</p></div>
</dd>
<dt class="hdlist1">
&lt;branch&gt;
</dt>
<dd>
<p>
Branch to checkout; if it refers to a branch (i.e., a name that,
when prepended with "refs/heads/", is a valid ref), then that
branch is checked out. Otherwise, if it refers to a valid
commit, your HEAD becomes "detached" and you are no longer on
any branch (see below for details).
</p>
<div class="paragraph"><p>As a special case, the <tt>"@{-N}"</tt> syntax for the N-th last branch
checks out the branch (instead of detaching). You may also specify
<tt>-</tt> which is synonymous with <tt>"@{-1}"</tt>.</p></div>
<div class="paragraph"><p>As a further special case, you may use <tt>"A...B"</tt> as a shortcut for the
merge base of <tt>A</tt> and <tt>B</tt> if there is exactly one merge base. You can
leave out at most one of <tt>A</tt> and <tt>B</tt>, in which case it defaults to <tt>HEAD</tt>.</p></div>
</dd>
<dt class="hdlist1">
&lt;new_branch&gt;
</dt>
<dd>
<p>
Name for the new branch.
</p>
</dd>
<dt class="hdlist1">
&lt;start_point&gt;
</dt>
<dd>
<p>
The name of a commit at which to start the new branch; see
<a href="git-branch.html">git-branch(1)</a> for details. Defaults to HEAD.
</p>
</dd>
<dt class="hdlist1">
&lt;tree-ish&gt;
</dt>
<dd>
<p>
Tree to checkout from (when paths are given). If not specified,
the index will be used.
</p>
</dd>
</dl></div>
</div>
<h2 id="_detached_head">DETACHED HEAD</h2>
<div class="sectionbody">
<div class="paragraph"><p>HEAD normally refers to a named branch (e.g. <em>master</em>). Meanwhile, each
branch refers to a specific commit. Let&#8217;s look at a repo with three
commits, one of them tagged, and with branch <em>master</em> checked out:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> HEAD (refers to branch 'master')
|
v
a---b---c branch 'master' (refers to commit 'c')
^
|
tag 'v2.0' (refers to commit 'b')</tt></pre>
</div></div>
<div class="paragraph"><p>When a commit is created in this state, the branch is updated to refer to
the new commit. Specifically, <em>git commit</em> creates a new commit <em>d</em>, whose
parent is commit <em>c</em>, and then updates branch <em>master</em> to refer to new
commit <em>d</em>. HEAD still refers to branch <em>master</em> and so indirectly now refers
to commit <em>d</em>:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ edit; git add; git commit
HEAD (refers to branch 'master')
|
v
a---b---c---d branch 'master' (refers to commit 'd')
^
|
tag 'v2.0' (refers to commit 'b')</tt></pre>
</div></div>
<div class="paragraph"><p>It is sometimes useful to be able to checkout a commit that is not at
the tip of any named branch, or even to create a new commit that is not
referenced by a named branch. Let&#8217;s look at what happens when we
checkout commit <em>b</em> (here we show two ways this may be done):</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git checkout v2.0 # or
$ git checkout master^^
HEAD (refers to commit 'b')
|
v
a---b---c---d branch 'master' (refers to commit 'd')
^
|
tag 'v2.0' (refers to commit 'b')</tt></pre>
</div></div>
<div class="paragraph"><p>Notice that regardless of which checkout command we use, HEAD now refers
directly to commit <em>b</em>. This is known as being in detached HEAD state.
It means simply that HEAD refers to a specific commit, as opposed to
referring to a named branch. Let&#8217;s see what happens when we create a commit:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ edit; git add; git commit
HEAD (refers to commit 'e')
|
v
e
/
a---b---c---d branch 'master' (refers to commit 'd')
^
|
tag 'v2.0' (refers to commit 'b')</tt></pre>
</div></div>
<div class="paragraph"><p>There is now a new commit <em>e</em>, but it is referenced only by HEAD. We can
of course add yet another commit in this state:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ edit; git add; git commit
HEAD (refers to commit 'f')
|
v
e---f
/
a---b---c---d branch 'master' (refers to commit 'd')
^
|
tag 'v2.0' (refers to commit 'b')</tt></pre>
</div></div>
<div class="paragraph"><p>In fact, we can perform all the normal git operations. But, let&#8217;s look
at what happens when we then checkout master:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git checkout master
HEAD (refers to branch 'master')
e---f |
/ v
a---b---c---d branch 'master' (refers to commit 'd')
^
|
tag 'v2.0' (refers to commit 'b')</tt></pre>
</div></div>
<div class="paragraph"><p>It is important to realize that at this point nothing refers to commit
<em>f</em>. Eventually commit <em>f</em> (and by extension commit <em>e</em>) will be deleted
by the routine git garbage collection process, unless we create a reference
before that happens. If we have not yet moved away from commit <em>f</em>,
any of these will create a reference to it:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git checkout -b foo <b>&lt;1&gt;</b>
$ git branch foo <b>&lt;2&gt;</b>
$ git tag foo <b>&lt;3&gt;</b></tt></pre>
</div></div>
<div class="colist arabic"><ol>
<li>
<p>
creates a new branch <em>foo</em>, which refers to commit <em>f</em>, and then
updates HEAD to refer to branch <em>foo</em>. In other words, we&#8217;ll no longer
be in detached HEAD state after this command.
</p>
</li>
<li>
<p>
similarly creates a new branch <em>foo</em>, which refers to commit <em>f</em>,
but leaves HEAD detached.
</p>
</li>
<li>
<p>
creates a new tag <em>foo</em>, which refers to commit <em>f</em>,
leaving HEAD detached.
</p>
</li>
</ol></div>
<div class="paragraph"><p>If we have moved away from commit <em>f</em>, then we must first recover its object
name (typically by using git reflog), and then we can create a reference to
it. For example, to see the last two commits to which HEAD referred, we
can use either of these commands:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git reflog -2 HEAD # or
$ git log -g -2 HEAD</tt></pre>
</div></div>
</div>
<h2 id="_examples">EXAMPLES</h2>
<div class="sectionbody">
<div class="olist arabic"><ol class="arabic">
<li>
<p>
The following sequence checks out the <tt>master</tt> branch, reverts
the <tt>Makefile</tt> to two revisions back, deletes hello.c by
mistake, and gets it back from the index.
</p>
<div class="listingblock">
<div class="content">
<pre><tt>$ git checkout master <b>&lt;1&gt;</b>
$ git checkout master~2 Makefile <b>&lt;2&gt;</b>
$ rm -f hello.c
$ git checkout hello.c <b>&lt;3&gt;</b></tt></pre>
</div></div>
<div class="colist arabic"><ol>
<li>
<p>
switch branch
</p>
</li>
<li>
<p>
take a file out of another commit
</p>
</li>
<li>
<p>
restore hello.c from the index
</p>
<div class="paragraph"><p>If you have an unfortunate branch that is named <tt>hello.c</tt>, this
step would be confused as an instruction to switch to that branch.
You should instead write:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git checkout -- hello.c</tt></pre>
</div></div>
</li>
</ol></div>
</li>
<li>
<p>
After working in the wrong branch, switching to the correct
branch would be done using:
</p>
<div class="listingblock">
<div class="content">
<pre><tt>$ git checkout mytopic</tt></pre>
</div></div>
<div class="paragraph"><p>However, your "wrong" branch and correct "mytopic" branch may
differ in files that you have modified locally, in which case
the above checkout would fail like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git checkout mytopic
error: You have local changes to 'frotz'; not switching branches.</tt></pre>
</div></div>
<div class="paragraph"><p>You can give the <tt>-m</tt> flag to the command, which would try a
three-way merge:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git checkout -m mytopic
Auto-merging frotz</tt></pre>
</div></div>
<div class="paragraph"><p>After this three-way merge, the local modifications are <em>not</em>
registered in your index file, so <tt>git diff</tt> would show you what
changes you made since the tip of the new branch.</p></div>
</li>
<li>
<p>
When a merge conflict happens during switching branches with
the <tt>-m</tt> option, you would see something like this:
</p>
<div class="listingblock">
<div class="content">
<pre><tt>$ git checkout -m mytopic
Auto-merging frotz
ERROR: Merge conflict in frotz
fatal: merge program failed</tt></pre>
</div></div>
<div class="paragraph"><p>At this point, <tt>git diff</tt> shows the changes cleanly merged as in
the previous example, as well as the changes in the conflicted
files. Edit and resolve the conflict and mark it resolved with
<tt>git add</tt> as usual:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ edit frotz
$ git add frotz</tt></pre>
</div></div>
</li>
</ol></div>
</div>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2011-05-11 20:08:54 UTC
</div>
</div>
</body>
</html>