| blob | c8e300fc3bb76e57c5ee66b1a102944137a2948c |
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 }
129 }
133 }
135 /* Block element titles. */
143 }
146 }
150 }
153 }
156 }
162 }
168 }
176 }
181 }
185 }
189 }
190 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
193 }
202 }
206 }
211 }
217 dl {
220 }
221 dt {
226 }
229 }
233 }
236 }
239 }
242 }
245 }
248 }
255 }
259 }
263 }
264 tfoot {
266 }
269 }
272 }
273 /* Because the table frame attribute is overriden by CSS in most browsers. */
276 }
280 }
284 }
290 }
293 }
296 }
302 }
305 }
309 }
313 }
317 }
321 }
326 }
330 }
340 }
345 }
347 div#toc {
349 }
351 div#toctitle {
358 }
363 }
367 }
371 }
375 }
376 /* Overrides for manpage documents */
377 h1 {
382 }
383 h2 {
385 }
388 }
392 }
394 /* Workarounds for IE6's broken and incomplete CSS2. */
400 }
407 }
413 }
418 }
422 }
426 }
431 }
433 /* IE6 sets dynamically generated links as visited. */
435 </style>
437 /*<![CDATA[*/
441 /////////////////////////////////////////////////////////////////////
442 // Table Of Contents generator
443 /////////////////////////////////////////////////////////////////////
445 /* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
447 *
448 * Table Of Content generator
449 * Version: 0.4
450 *
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
453 */
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
458 // toclevels = 1..4.
468 }
470 }
476 }
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
483 // browsers).
490 }
492 }
493 }
494 }
497 }
512 }
515 },
518 /////////////////////////////////////////////////////////////////////
519 // Footnotes generator
520 /////////////////////////////////////////////////////////////////////
522 /* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
524 */
534 n++;
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
547 }
548 }
552 // Process footnoterefs.
561 }
562 }
563 }
564 }
566 }
567 /*]]>*/
568 </script>
569 </head>
570 <body>
572 <h1>
573 git-checkout(1) Manual Page
574 </h1>
577 <p>git-checkout -
578 Checkout a branch or paths to the working tree
579 </p>
580 </div>
581 </div>
588 <em>git checkout</em> [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]
589 <em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>…
592 </div></div>
593 </div>
599 branch.</p></div>
603 </dt>
606 </dt>
609 </dt>
610 <dd>
611 <p>
612 This form switches branches by updating the index, working
613 tree, and HEAD to reflect the specified branch or commit.
614 </p>
615 <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>
616 were called and then checked out; in this case you can
620 <div class="paragraph"><p>If <tt>-B</tt> is given, <new_branch> is created if it doesn’t exist; otherwise, it
621 is reset. This is the transactional equivalent of</p></div>
626 </div></div>
627 <div class="paragraph"><p>that is to say, the branch is not reset/created unless "git checkout" is
628 successful.</p></div>
629 </dd>
632 </dt>
633 <dd>
634 <p>
635 When <paths> or <tt>--patch</tt> are given, <em>git checkout</em> does <strong>not</strong>
636 switch branches. It updates the named paths in the working tree
639 meaningless and giving either of them results in an error. The
641 (i.e. commit, tag or tree) to update the index for the given
642 paths before updating the working tree.
643 </p>
644 <div class="paragraph"><p>The index may contain unmerged entries because of a previous failed merge.
645 By default, if you try to check out such an entry from the index, the
646 checkout operation will fail and nothing will be checked out.
648 specific side of the merge can be checked out of the index by
650 file can be discarded to re-create the original conflicted merge result.</p></div>
651 </dd>
652 </dl></div>
653 </div>
658 -q
659 </dt>
661 --quiet
662 </dt>
663 <dd>
664 <p>
665 Quiet, suppress feedback messages.
666 </p>
667 </dd>
669 -f
670 </dt>
672 --force
673 </dt>
674 <dd>
675 <p>
676 When switching branches, proceed even if the index or the
677 working tree differs from HEAD. This is used to throw away
678 local changes.
679 </p>
681 entries; instead, unmerged entries are ignored.</p></div>
682 </dd>
684 --ours
685 </dt>
687 --theirs
688 </dt>
689 <dd>
690 <p>
691 When checking out paths from the index, check out stage #2
693 </p>
694 </dd>
696 -b
697 </dt>
698 <dd>
699 <p>
702 </p>
703 </dd>
705 -B
706 </dt>
707 <dd>
708 <p>
713 </p>
714 </dd>
716 -t
717 </dt>
719 --track
720 </dt>
721 <dd>
722 <p>
723 When creating a new branch, set up "upstream" configuration. See
725 </p>
728 is prefixed it is stripped away, and then the part up to the
729 next slash (which would be the nickname of the remote) is removed.
730 This would tell us to use "hack" as the local branch when branching
732 "refs/remotes/origin/hack"). If the given name has no slash, or the above
733 guessing results in an empty name, the guessing is aborted. You can
735 </dd>
737 --no-track
738 </dt>
739 <dd>
740 <p>
741 Do not set up "upstream" configuration, even if the
742 branch.autosetupmerge configuration variable is true.
743 </p>
744 </dd>
746 -l
747 </dt>
748 <dd>
749 <p>
751 details.
752 </p>
753 </dd>
755 --detach
756 </dt>
757 <dd>
758 <p>
759 Rather than checking out a branch to work on it, check out a
760 commit for inspection and discardable experiments.
761 This is the default behavior of "git checkout <commit>" when
763 below for details.
764 </p>
765 </dd>
767 --orphan
768 </dt>
769 <dd>
770 <p>
773 new branch will have no parents and it will be the root of a new
774 history totally disconnected from all the other branches and
775 commits.
776 </p>
777 <div class="paragraph"><p>The index and the working tree are adjusted as if you had previously run
778 "git checkout <start_point>". This allows you to start a new history
782 without exposing its full history. You might want to do this to publish
783 an open source branch of a project whose current tree is "clean", but
784 whose full history contains proprietary or otherwise encumbered bits of
785 code.</p></div>
786 <div class="paragraph"><p>If you want to start a disconnected history that records a set of paths
788 clear the index and the working tree right after creating the orphan
789 branch by running "git rm -rf ." from the top level of the working tree.
790 Afterwards you will be ready to prepare your new files, repopulating the
791 working tree, by copying them from elsewhere, extracting a tarball, etc.</p></div>
792 </dd>
794 -m
795 </dt>
797 --merge
798 </dt>
799 <dd>
800 <p>
801 When switching branches,
802 if you have local modifications to one or more files that
803 are different between the current branch and the branch to
804 which you are switching, the command refuses to switch
805 branches in order to preserve your modifications in context.
806 However, with this option, a three-way merge between the current
807 branch, your working tree contents, and the new branch
808 is done, and you will be on the new branch.
809 </p>
811 paths are left unmerged, and you need to resolve the conflicts
813 should result in deletion of the path).</p></div>
815 the conflicted merge in the specified paths.</p></div>
816 </dd>
819 </dt>
820 <dd>
821 <p>
822 The same as --merge option above, but changes the way the
823 conflicting hunks are presented, overriding the
824 merge.conflictstyle configuration variable. Possible values are
826 "merge" style, shows the original contents).
827 </p>
828 </dd>
830 -p
831 </dt>
833 --patch
834 </dt>
835 <dd>
836 <p>
837 Interactively select hunks in the difference between the
839 tree. The chosen hunks are then applied in reverse to the
841 </p>
842 <div class="paragraph"><p>This means that you can use <tt>git checkout -p</tt> to selectively discard
844 section of <a href="git-add.html">git-add(1)</a> to learn how to operate the <tt>--patch</tt> mode.</p></div>
845 </dd>
848 </dt>
849 <dd>
850 <p>
851 Branch to checkout; if it refers to a branch (i.e., a name that,
852 when prepended with "refs/heads/", is a valid ref), then that
853 branch is checked out. Otherwise, if it refers to a valid
854 commit, your HEAD becomes "detached" and you are no longer on
855 any branch (see below for details).
856 </p>
857 <div class="paragraph"><p>As a special case, the <tt>"@{-N}"</tt> syntax for the N-th last branch
858 checks out the branch (instead of detaching). You may also specify
860 <div class="paragraph"><p>As a further special case, you may use <tt>"A...B"</tt> as a shortcut for the
862 leave out at most one of <tt>A</tt> and <tt>B</tt>, in which case it defaults to <tt>HEAD</tt>.</p></div>
863 </dd>
866 </dt>
867 <dd>
868 <p>
869 Name for the new branch.
870 </p>
871 </dd>
874 </dt>
875 <dd>
876 <p>
877 The name of a commit at which to start the new branch; see
879 </p>
880 </dd>
883 </dt>
884 <dd>
885 <p>
886 Tree to checkout from (when paths are given). If not specified,
887 the index will be used.
888 </p>
889 </dd>
890 </dl></div>
891 </div>
894 <div class="paragraph"><p>HEAD normally refers to a named branch (e.g. <em>master</em>). Meanwhile, each
895 branch refers to a specific commit. Let’s look at a repo with three
899 <pre><tt> HEAD (refers to branch 'master')
900 |
901 v
902 a---b---c branch 'master' (refers to commit 'c')
903 ^
904 |
905 tag 'v2.0' (refers to commit 'b')</tt></pre>
906 </div></div>
907 <div class="paragraph"><p>When a commit is created in this state, the branch is updated to refer to
914 <pre><tt>$ edit; git add; git commit
916 HEAD (refers to branch 'master')
917 |
918 v
919 a---b---c---d branch 'master' (refers to commit 'd')
920 ^
921 |
922 tag 'v2.0' (refers to commit 'b')</tt></pre>
923 </div></div>
925 the tip of any named branch, or even to create a new commit that is not
926 referenced by a named branch. Let’s look at what happens when we
930 <pre><tt>$ git checkout v2.0 # or
931 $ git checkout master^^
933 HEAD (refers to commit 'b')
934 |
935 v
936 a---b---c---d branch 'master' (refers to commit 'd')
937 ^
938 |
939 tag 'v2.0' (refers to commit 'b')</tt></pre>
940 </div></div>
941 <div class="paragraph"><p>Notice that regardless of which checkout command we use, HEAD now refers
943 It means simply that HEAD refers to a specific commit, as opposed to
947 <pre><tt>$ edit; git add; git commit
949 HEAD (refers to commit 'e')
950 |
951 v
952 e
953 /
954 a---b---c---d branch 'master' (refers to commit 'd')
955 ^
956 |
957 tag 'v2.0' (refers to commit 'b')</tt></pre>
958 </div></div>
959 <div class="paragraph"><p>There is now a new commit <em>e</em>, but it is referenced only by HEAD. We can
960 of course add yet another commit in this state:</p></div>
963 <pre><tt>$ edit; git add; git commit
965 HEAD (refers to commit 'f')
966 |
967 v
968 e---f
969 /
970 a---b---c---d branch 'master' (refers to commit 'd')
971 ^
972 |
973 tag 'v2.0' (refers to commit 'b')</tt></pre>
974 </div></div>
975 <div class="paragraph"><p>In fact, we can perform all the normal git operations. But, let’s look
976 at what happens when we then checkout master:</p></div>
979 <pre><tt>$ git checkout master
981 HEAD (refers to branch 'master')
982 e---f |
983 / v
984 a---b---c---d branch 'master' (refers to commit 'd')
985 ^
986 |
987 tag 'v2.0' (refers to commit 'b')</tt></pre>
988 </div></div>
989 <div class="paragraph"><p>It is important to realize that at this point nothing refers to commit
991 by the routine git garbage collection process, unless we create a reference
993 any of these will create a reference to it:</p></div>
999 </div></div>
1001 <li>
1002 <p>
1005 be in detached HEAD state after this command.
1006 </p>
1007 </li>
1008 <li>
1009 <p>
1011 but leaves HEAD detached.
1012 </p>
1013 </li>
1014 <li>
1015 <p>
1017 leaving HEAD detached.
1018 </p>
1019 </li>
1020 </ol></div>
1021 <div class="paragraph"><p>If we have moved away from commit <em>f</em>, then we must first recover its object
1022 name (typically by using git reflog), and then we can create a reference to
1023 it. For example, to see the last two commits to which HEAD referred, we
1024 can use either of these commands:</p></div>
1029 </div></div>
1030 </div>
1034 <li>
1035 <p>
1038 mistake, and gets it back from the index.
1039 </p>
1044 $ rm -f hello.c
1046 </div></div>
1048 <li>
1049 <p>
1050 switch branch
1051 </p>
1052 </li>
1053 <li>
1054 <p>
1055 take a file out of another commit
1056 </p>
1057 </li>
1058 <li>
1059 <p>
1060 restore hello.c from the index
1061 </p>
1062 <div class="paragraph"><p>If you have an unfortunate branch that is named <tt>hello.c</tt>, this
1063 step would be confused as an instruction to switch to that branch.
1064 You should instead write:</p></div>
1068 </div></div>
1069 </li>
1070 </ol></div>
1071 </li>
1072 <li>
1073 <p>
1074 After working in the wrong branch, switching to the correct
1075 branch would be done using:
1076 </p>
1080 </div></div>
1082 differ in files that you have modified locally, in which case
1083 the above checkout would fail like this:</p></div>
1086 <pre><tt>$ git checkout mytopic
1087 error: You have local changes to 'frotz'; not switching branches.</tt></pre>
1088 </div></div>
1090 three-way merge:</p></div>
1093 <pre><tt>$ git checkout -m mytopic
1094 Auto-merging frotz</tt></pre>
1095 </div></div>
1098 changes you made since the tip of the new branch.</p></div>
1099 </li>
1100 <li>
1101 <p>
1102 When a merge conflict happens during switching branches with
1104 </p>
1107 <pre><tt>$ git checkout -m mytopic
1108 Auto-merging frotz
1109 ERROR: Merge conflict in frotz
1110 fatal: merge program failed</tt></pre>
1111 </div></div>
1112 <div class="paragraph"><p>At this point, <tt>git diff</tt> shows the changes cleanly merged as in
1113 the previous example, as well as the changes in the conflicted
1114 files. Edit and resolve the conflict and mark it resolved with
1118 <pre><tt>$ edit frotz
1119 $ git add frotz</tt></pre>
1120 </div></div>
1121 </li>
1122 </ol></div>
1123 </div>
1127 </div>
1128 </div>
1133 </div>
1134 </div>
1135 </body>
1136 </html>