| blob | 96201509a09bb8138ec2660f6cfacdaf37c0482e |
4 <head>
9 /* Debug borders */
11 /*
12 border: 1px solid red;
13 */
14 }
16 body {
18 }
20 a {
23 }
26 }
28 em {
31 }
33 strong {
36 }
38 tt {
40 }
48 }
52 }
53 h2 {
55 }
56 h3 {
58 }
59 h3 + * {
61 }
66 }
68 hr {
70 }
72 p {
75 }
79 }
81 pre {
84 }
86 span#author {
91 }
92 span#email {
93 }
96 }
98 div#footer {
104 }
105 div#footer-text {
108 }
109 div#footer-badges {
112 }
114 div#preamble {
117 }
123 }
127 }
131 }
133 /* Block element titles. */
141 }
144 }
148 }
151 }
154 }
160 }
166 }
171 }
175 }
180 }
183 }
187 }
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
191 }
200 }
204 }
209 }
215 dl {
218 }
219 dt {
224 }
227 }
231 }
234 }
237 }
240 }
243 }
246 }
253 }
257 }
258 thead {
261 }
262 tfoot {
264 }
267 }
270 }
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
274 }
278 }
282 }
288 }
291 }
294 }
300 }
303 }
307 }
311 }
315 }
317 div#toctitle {
324 }
329 }
333 }
337 }
341 }
342 /* Overrides for manpage documents */
343 h1 {
348 }
349 h2 {
351 }
354 }
358 }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
366 }
373 }
379 }
384 }
388 }
392 }
397 }
399 /* IE6 sets dynamically generated links as visited. */
401 </style>
402 </head>
403 <body>
405 <h1>
406 git-checkout(1) Manual Page
407 </h1>
410 <p>git-checkout -
411 Checkout a branch or paths to the working tree
412 </p>
413 </div>
414 </div>
420 <em>git checkout</em> [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]
421 <em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>…
424 </div></div>
425 </div>
431 branch.</p></div>
435 </dt>
438 </dt>
441 </dt>
442 <dd>
443 <p>
444 This form switches branches by updating the index, working
445 tree, and HEAD to reflect the specified branch or commit.
446 </p>
447 <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>
448 were called and then checked out; in this case you can
452 <div class="paragraph"><p>If <tt>-B</tt> is given, <new_branch> is created if it doesn’t exist; otherwise, it
453 is reset. This is the transactional equivalent of</p></div>
458 </div></div>
459 <div class="paragraph"><p>that is to say, the branch is not reset/created unless "git checkout" is
460 successful.</p></div>
461 </dd>
464 </dt>
465 <dd>
466 <p>
467 When <paths> or <tt>--patch</tt> are given, <em>git checkout</em> does <strong>not</strong>
468 switch branches. It updates the named paths in the working tree
471 meaningless and giving either of them results in an error. The
473 (i.e. commit, tag or tree) to update the index for the given
474 paths before updating the working tree.
475 </p>
476 <div class="paragraph"><p>The index may contain unmerged entries because of a previous failed merge.
477 By default, if you try to check out such an entry from the index, the
478 checkout operation will fail and nothing will be checked out.
480 specific side of the merge can be checked out of the index by
482 file can be discarded to re-create the original conflicted merge result.</p></div>
483 </dd>
484 </dl></div>
485 </div>
490 -q
491 </dt>
493 --quiet
494 </dt>
495 <dd>
496 <p>
497 Quiet, suppress feedback messages.
498 </p>
499 </dd>
501 -f
502 </dt>
504 --force
505 </dt>
506 <dd>
507 <p>
508 When switching branches, proceed even if the index or the
509 working tree differs from HEAD. This is used to throw away
510 local changes.
511 </p>
513 entries; instead, unmerged entries are ignored.</p></div>
514 </dd>
516 --ours
517 </dt>
519 --theirs
520 </dt>
521 <dd>
522 <p>
523 When checking out paths from the index, check out stage #2
525 </p>
526 </dd>
528 -b
529 </dt>
530 <dd>
531 <p>
534 </p>
535 </dd>
537 -B
538 </dt>
539 <dd>
540 <p>
545 </p>
546 </dd>
548 -t
549 </dt>
551 --track
552 </dt>
553 <dd>
554 <p>
555 When creating a new branch, set up "upstream" configuration. See
557 </p>
560 is prefixed it is stripped away, and then the part up to the
561 next slash (which would be the nickname of the remote) is removed.
562 This would tell us to use "hack" as the local branch when branching
564 "refs/remotes/origin/hack"). If the given name has no slash, or the above
565 guessing results in an empty name, the guessing is aborted. You can
567 </dd>
569 --no-track
570 </dt>
571 <dd>
572 <p>
573 Do not set up "upstream" configuration, even if the
574 branch.autosetupmerge configuration variable is true.
575 </p>
576 </dd>
578 -l
579 </dt>
580 <dd>
581 <p>
583 details.
584 </p>
585 </dd>
587 --detach
588 </dt>
589 <dd>
590 <p>
591 Rather than checking out a branch to work on it, check out a
592 commit for inspection and discardable experiments.
593 This is the default behavior of "git checkout <commit>" when
595 below for details.
596 </p>
597 </dd>
599 --orphan
600 </dt>
601 <dd>
602 <p>
605 new branch will have no parents and it will be the root of a new
606 history totally disconnected from all the other branches and
607 commits.
608 </p>
609 <div class="paragraph"><p>The index and the working tree are adjusted as if you had previously run
610 "git checkout <start_point>". This allows you to start a new history
614 without exposing its full history. You might want to do this to publish
615 an open source branch of a project whose current tree is "clean", but
616 whose full history contains proprietary or otherwise encumbered bits of
617 code.</p></div>
618 <div class="paragraph"><p>If you want to start a disconnected history that records a set of paths
620 clear the index and the working tree right after creating the orphan
621 branch by running "git rm -rf ." from the top level of the working tree.
622 Afterwards you will be ready to prepare your new files, repopulating the
623 working tree, by copying them from elsewhere, extracting a tarball, etc.</p></div>
624 </dd>
626 -m
627 </dt>
629 --merge
630 </dt>
631 <dd>
632 <p>
633 When switching branches,
634 if you have local modifications to one or more files that
635 are different between the current branch and the branch to
636 which you are switching, the command refuses to switch
637 branches in order to preserve your modifications in context.
638 However, with this option, a three-way merge between the current
639 branch, your working tree contents, and the new branch
640 is done, and you will be on the new branch.
641 </p>
643 paths are left unmerged, and you need to resolve the conflicts
645 should result in deletion of the path).</p></div>
647 the conflicted merge in the specified paths.</p></div>
648 </dd>
651 </dt>
652 <dd>
653 <p>
654 The same as --merge option above, but changes the way the
655 conflicting hunks are presented, overriding the
656 merge.conflictstyle configuration variable. Possible values are
658 "merge" style, shows the original contents).
659 </p>
660 </dd>
662 -p
663 </dt>
665 --patch
666 </dt>
667 <dd>
668 <p>
669 Interactively select hunks in the difference between the
671 tree. The chosen hunks are then applied in reverse to the
673 </p>
674 <div class="paragraph"><p>This means that you can use <tt>git checkout -p</tt> to selectively discard
675 edits from your current working tree.</p></div>
676 </dd>
679 </dt>
680 <dd>
681 <p>
682 Branch to checkout; if it refers to a branch (i.e., a name that,
683 when prepended with "refs/heads/", is a valid ref), then that
684 branch is checked out. Otherwise, if it refers to a valid
685 commit, your HEAD becomes "detached" and you are no longer on
686 any branch (see below for details).
687 </p>
688 <div class="paragraph"><p>As a special case, the <tt>"@{-N}"</tt> syntax for the N-th last branch
689 checks out the branch (instead of detaching). You may also specify
691 <div class="paragraph"><p>As a further special case, you may use <tt>"A...B"</tt> as a shortcut for the
693 leave out at most one of <tt>A</tt> and <tt>B</tt>, in which case it defaults to <tt>HEAD</tt>.</p></div>
694 </dd>
697 </dt>
698 <dd>
699 <p>
700 Name for the new branch.
701 </p>
702 </dd>
705 </dt>
706 <dd>
707 <p>
708 The name of a commit at which to start the new branch; see
710 </p>
711 </dd>
714 </dt>
715 <dd>
716 <p>
717 Tree to checkout from (when paths are given). If not specified,
718 the index will be used.
719 </p>
720 </dd>
721 </dl></div>
722 </div>
725 <div class="paragraph"><p>HEAD normally refers to a named branch (e.g. <em>master</em>). Meanwhile, each
726 branch refers to a specific commit. Let’s look at a repo with three
730 <pre><tt> HEAD (refers to branch 'master')
731 |
732 v
733 a---b---c branch 'master' (refers to commit 'c')
734 ^
735 |
736 tag 'v2.0' (refers to commit 'b')</tt></pre>
737 </div></div>
738 <div class="paragraph"><p>When a commit is created in this state, the branch is updated to refer to
745 <pre><tt>$ edit; git add; git commit
747 HEAD (refers to branch 'master')
748 |
749 v
750 a---b---c---d branch 'master' (refers to commit 'd')
751 ^
752 |
753 tag 'v2.0' (refers to commit 'b')</tt></pre>
754 </div></div>
756 the tip of any named branch, or even to create a new commit that is not
757 referenced by a named branch. Let’s look at what happens when we
761 <pre><tt>$ git checkout v2.0 # or
762 $ git checkout master^^
764 HEAD (refers to commit 'b')
765 |
766 v
767 a---b---c---d branch 'master' (refers to commit 'd')
768 ^
769 |
770 tag 'v2.0' (refers to commit 'b')</tt></pre>
771 </div></div>
772 <div class="paragraph"><p>Notice that regardless of which checkout command we use, HEAD now refers
774 It means simply that HEAD refers to a specific commit, as opposed to
778 <pre><tt>$ edit; git add; git commit
780 HEAD (refers to commit 'e')
781 |
782 v
783 e
784 /
785 a---b---c---d branch 'master' (refers to commit 'd')
786 ^
787 |
788 tag 'v2.0' (refers to commit 'b')</tt></pre>
789 </div></div>
790 <div class="paragraph"><p>There is now a new commit <em>e</em>, but it is referenced only by HEAD. We can
791 of course add yet another commit in this state:</p></div>
794 <pre><tt>$ edit; git add; git commit
796 HEAD (refers to commit 'f')
797 |
798 v
799 e---f
800 /
801 a---b---c---d branch 'master' (refers to commit 'd')
802 ^
803 |
804 tag 'v2.0' (refers to commit 'b')</tt></pre>
805 </div></div>
806 <div class="paragraph"><p>In fact, we can perform all the normal git operations. But, let’s look
807 at what happens when we then checkout master:</p></div>
810 <pre><tt>$ git checkout master
812 HEAD (refers to branch 'master')
813 e---f |
814 / v
815 a---b---c---d branch 'master' (refers to commit 'd')
816 ^
817 |
818 tag 'v2.0' (refers to commit 'b')</tt></pre>
819 </div></div>
820 <div class="paragraph"><p>It is important to realize that at this point nothing refers to commit
822 by the routine git garbage collection process, unless we create a reference
824 any of these will create a reference to it:</p></div>
830 </div></div>
832 <li>
833 <p>
836 be in detached HEAD state after this command.
837 </p>
838 </li>
839 <li>
840 <p>
842 but leaves HEAD detached.
843 </p>
844 </li>
845 <li>
846 <p>
848 leaving HEAD detached.
849 </p>
850 </li>
851 </ol></div>
852 <div class="paragraph"><p>If we have moved away from commit <em>f</em>, then we must first recover its object
853 name (typically by using git reflog), and then we can create a reference to
854 it. For example, to see the last two commits to which HEAD referred, we
855 can use either of these commands:</p></div>
860 </div></div>
861 </div>
865 <li>
866 <p>
869 mistake, and gets it back from the index.
870 </p>
875 $ rm -f hello.c
877 </div></div>
879 <li>
880 <p>
881 switch branch
882 </p>
883 </li>
884 <li>
885 <p>
886 take a file out of another commit
887 </p>
888 </li>
889 <li>
890 <p>
891 restore hello.c from the index
892 </p>
893 <div class="paragraph"><p>If you have an unfortunate branch that is named <tt>hello.c</tt>, this
894 step would be confused as an instruction to switch to that branch.
895 You should instead write:</p></div>
899 </div></div>
900 </li>
901 </ol></div>
902 </li>
903 <li>
904 <p>
905 After working in the wrong branch, switching to the correct
906 branch would be done using:
907 </p>
911 </div></div>
913 differ in files that you have modified locally, in which case
914 the above checkout would fail like this:</p></div>
917 <pre><tt>$ git checkout mytopic
918 error: You have local changes to 'frotz'; not switching branches.</tt></pre>
919 </div></div>
921 three-way merge:</p></div>
924 <pre><tt>$ git checkout -m mytopic
925 Auto-merging frotz</tt></pre>
926 </div></div>
929 changes you made since the tip of the new branch.</p></div>
930 </li>
931 <li>
932 <p>
933 When a merge conflict happens during switching branches with
935 </p>
938 <pre><tt>$ git checkout -m mytopic
939 Auto-merging frotz
940 ERROR: Merge conflict in frotz
941 fatal: merge program failed</tt></pre>
942 </div></div>
943 <div class="paragraph"><p>At this point, <tt>git diff</tt> shows the changes cleanly merged as in
944 the previous example, as well as the changes in the conflicted
945 files. Edit and resolve the conflict and mark it resolved with
949 <pre><tt>$ edit frotz
950 $ git add frotz</tt></pre>
951 </div></div>
952 </li>
953 </ol></div>
954 </div>
958 </div>
962 </div>
963 </div>
964 </body>
965 </html>