1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
\r
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\r
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
\r
5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
\r
6 <meta name="generator" content="AsciiDoc 7.0.1" />
\r
7 <style type="text/css">
\r
9 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
\r
11 border: 1px solid red;
\r
16 margin: 1em 5% 1em 5%;
\r
20 a:visited { color: fuchsia; }
\r
34 h1, h2, h3, h4, h5, h6 {
\r
36 font-family: sans-serif;
\r
38 margin-bottom: 0.5em;
\r
43 border-bottom: 2px solid silver;
\r
46 border-bottom: 2px solid silver;
\r
56 border: 1px solid silver;
\r
61 margin-bottom: 0.5em;
\r
71 font-family: sans-serif;
\r
78 font-family: sans-serif;
\r
82 font-family: sans-serif;
\r
84 border-top: 2px solid silver;
\r
90 padding-bottom: 0.5em;
\r
94 padding-bottom: 0.5em;
\r
98 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
\r
99 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
\r
100 div.admonitionblock {
\r
103 margin-bottom: 1.5em;
\r
105 div.admonitionblock {
\r
107 margin-bottom: 2.5em;
\r
110 div.content { /* Block element content. */
\r
114 /* Block element titles. */
\r
115 div.title, caption.title {
\r
116 font-family: sans-serif;
\r
120 margin-bottom: 0.5em;
\r
126 td div.title:first-child {
\r
129 div.content div.title:first-child {
\r
132 div.content + div.title {
\r
136 div.sidebarblock > div.content {
\r
137 background: #ffffee;
\r
138 border: 1px solid silver;
\r
142 div.listingblock > div.content {
\r
143 border: 1px solid silver;
\r
144 background: #f4f4f4;
\r
148 div.quoteblock > div.content {
\r
149 padding-left: 2.0em;
\r
151 div.quoteblock .attribution {
\r
155 div.admonitionblock .icon {
\r
156 vertical-align: top;
\r
159 text-decoration: underline;
\r
161 padding-right: 0.5em;
\r
163 div.admonitionblock td.content {
\r
164 padding-left: 0.5em;
\r
165 border-left: 2px solid silver;
\r
168 div.exampleblock > div.content {
\r
169 border-left: 2px solid silver;
\r
173 div.verseblock div.content {
\r
177 div.imageblock div.content { padding-left: 0; }
\r
178 div.imageblock img { border: 1px solid silver; }
\r
179 span.image img { border-style: none; }
\r
183 margin-bottom: 0.8em;
\r
188 font-style: italic;
\r
190 dd > *:first-child {
\r
195 list-style-position: outside;
\r
198 list-style-type: lower-alpha;
\r
201 div.tableblock > table {
\r
202 border-color: #527bbd;
\r
206 font-family: sans-serif;
\r
215 margin-bottom: 0.8em;
\r
218 vertical-align: top;
\r
219 font-style: italic;
\r
220 padding-right: 0.8em;
\r
223 vertical-align: top;
\r
227 div#footer-badges { display: none; }
\r
229 include::./stylesheets/xhtml11-manpage.css[]
\r
230 /* Workarounds for IE6's broken and incomplete CSS2. */
\r
232 div.sidebar-content {
\r
233 background: #ffffee;
\r
234 border: 1px solid silver;
\r
237 div.sidebar-title, div.image-title {
\r
238 font-family: sans-serif;
\r
241 margin-bottom: 0.5em;
\r
244 div.listingblock div.content {
\r
245 border: 1px solid silver;
\r
246 background: #f4f4f4;
\r
250 div.quoteblock-content {
\r
251 padding-left: 2.0em;
\r
254 div.exampleblock-content {
\r
255 border-left: 2px solid silver;
\r
256 padding-left: 0.5em;
\r
259 <title>git-checkout(1)</title>
\r
264 git-checkout(1) Manual Page
\r
267 <div class="sectionbody">
\r
269 Checkout and switch to a branch.
\r
274 <div class="sectionbody">
\r
275 <p><em>git-checkout</em> [-f] [-b <new_branch>] [-m] [<branch>] [<paths>…]</p>
\r
277 <h2>DESCRIPTION</h2>
\r
278 <div class="sectionbody">
\r
279 <p>When <paths> are not given, this command switches branches, by
\r
280 updating the index and working tree to reflect the specified
\r
281 branch, <branch>, and updating HEAD to be <branch> or, if
\r
282 specified, <new_branch>.</p>
\r
283 <p>When <paths> are given, this command does <strong>not</strong> switch
\r
284 branches. It updates the named paths in the working tree from
\r
285 the index file (i.e. it runs <tt>git-checkout-index -f -u</tt>). In
\r
286 this case, <tt>-f</tt> and <tt>-b</tt> options are meaningless and giving
\r
287 either of them results in an error. <branch> argument can be
\r
288 used to specify a specific tree-ish to update the index for the
\r
289 given paths before updating the working tree.</p>
\r
292 <div class="sectionbody">
\r
299 Force an re-read of everything.
\r
307 Create a new branch and start it at <branch>.
\r
315 If you have local modifications to a file that is
\r
316 different between the current branch and the branch you
\r
317 are switching to, the command refuses to switch
\r
318 branches, to preserve your modifications in context.
\r
319 With this option, a three-way merge between the current
\r
320 branch, your working tree contents, and the new branch
\r
321 is done, and you will be on the new branch.
\r
323 <p>When a merge conflict happens, the index entries for conflicting
\r
324 paths are left unmerged, and you need to resolve the conflicts
\r
325 and mark the resolved paths with <tt>git update-index</tt>.</p>
\r
332 Name for the new branch.
\r
340 Branch to checkout; may be any object ID that resolves to a
\r
341 commit. Defaults to HEAD.
\r
347 <div class="sectionbody">
\r
351 The following sequence checks out the <tt>master</tt> branch, reverts
\r
352 the <tt>Makefile</tt> to two revisions back, deletes hello.c by
\r
353 mistake, and gets it back from the index.
\r
355 <div class="listingblock">
\r
356 <div class="content">
\r
357 <pre><tt>$ git checkout master <b>(1)</b>
\r
358 $ git checkout master~2 Makefile <b>(2)</b>
\r
360 $ git checkout hello.c <b>(3)</b>
\r
362 <b>(1)</b> switch branch
\r
363 <b>(2)</b> take out a file out of other commit
\r
364 <b>(3)</b> or "git checkout -- hello.c", as in the next example.</tt></pre>
\r
366 <p>If you have an unfortunate branch that is named <tt>hello.c</tt>, the
\r
367 last step above would be confused as an instruction to switch to
\r
368 that branch. You should instead write:</p>
\r
369 <div class="listingblock">
\r
370 <div class="content">
\r
371 <pre><tt>$ git checkout -- hello.c</tt></pre>
\r
376 After working in a wrong branch, switching to the correct
\r
377 branch you would want to is done with:
\r
379 <div class="listingblock">
\r
380 <div class="content">
\r
381 <pre><tt>$ git checkout mytopic</tt></pre>
\r
383 <p>However, your "wrong" branch and correct "mytopic" branch may
\r
384 differ in files that you have locally modified, in which case,
\r
385 the above checkout would fail like this:</p>
\r
386 <div class="listingblock">
\r
387 <div class="content">
\r
388 <pre><tt>$ git checkout mytopic
\r
389 fatal: Entry 'frotz' not uptodate. Cannot merge.</tt></pre>
\r
391 <p>You can give the <tt>-m</tt> flag to the command, which would try a
\r
392 three-way merge:</p>
\r
393 <div class="listingblock">
\r
394 <div class="content">
\r
395 <pre><tt>$ git checkout -m mytopic
\r
396 Auto-merging frotz</tt></pre>
\r
398 <p>After this three-way merge, the local modifications are _not_
\r
399 registered in your index file, so <tt>git diff</tt> would show you what
\r
400 changes you made since the tip of the new branch.</p>
\r
404 When a merge conflict happens during switching branches with
\r
405 the <tt>-m</tt> option, you would see something like this:
\r
407 <div class="listingblock">
\r
408 <div class="content">
\r
409 <pre><tt>$ git checkout -m mytopic
\r
411 merge: warning: conflicts during merge
\r
412 ERROR: Merge conflict in frotz
\r
413 fatal: merge program failed</tt></pre>
\r
415 <p>At this point, <tt>git diff</tt> shows the changes cleanly merged as in
\r
416 the previous example, as well as the changes in the conflicted
\r
417 files. Edit and resolve the conflict and mark it resolved with
\r
418 <tt>git update-index</tt> as usual:</p>
\r
419 <div class="listingblock">
\r
420 <div class="content">
\r
421 <pre><tt>$ edit frotz
\r
422 $ git update-index frotz</tt></pre>
\r
428 <div class="sectionbody">
\r
429 <p>Written by Linus Torvalds <torvalds@osdl.org></p>
\r
431 <h2>Documentation</h2>
\r
432 <div class="sectionbody">
\r
433 <p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
\r
436 <div class="sectionbody">
\r
437 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
440 <div id="footer-text">
\r
441 Last updated 13-Jan-2006 19:58:25 PDT
\r