| blob | fe831115ad25ca5de2016d7b9edfcfadf6e5d299 |
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-reset(1) Manual Page
407 </h1>
410 <p>git-reset -
411 Reset current HEAD to the specified state
412 </p>
413 </div>
414 </div>
418 <div class="verseblock-content"><em>git reset</em> [-q] [<commit>] [--] <paths>…
422 </div></div>
423 </div>
426 <div class="paragraph"><p>In the first and second form, copy entries from <commit> to the index.
429 in all forms.</p></div>
433 </dt>
434 <dd>
435 <p>
438 the current branch.)
439 </p>
440 <div class="paragraph"><p>This means that <tt>git reset <paths></tt> is the opposite of <tt>git add
442 <div class="paragraph"><p>After running <tt>git reset <paths></tt> to update the index entry, you can
444 the working tree.
445 Alternatively, using <a href="git-checkout.html">git-checkout(1)</a> and specifying a commit, you
446 can copy the contents of a path out of a commit to the index and to the
447 working tree in one go.</p></div>
448 </dd>
451 </dt>
452 <dd>
453 <p>
454 Interactively select hunks in the difference between the index
456 in reverse to the index.
457 </p>
458 <div class="paragraph"><p>This means that <tt>git reset -p</tt> is the opposite of <tt>git add -p</tt> (see
460 </dd>
463 </dt>
464 <dd>
465 <p>
469 must be one of the following:
470 </p>
473 --soft
474 </dt>
475 <dd>
476 <p>
477 Does not touch the index file nor the working tree at all (but
480 would put it.
481 </p>
482 </dd>
484 --mixed
485 </dt>
486 <dd>
487 <p>
488 Resets the index but not the working tree (i.e., the changed files
489 are preserved but not marked for commit) and reports what has not
490 been updated. This is the default action.
491 </p>
492 </dd>
494 --hard
495 </dt>
496 <dd>
497 <p>
498 Resets the index and working tree. Any changes to tracked files in the
500 </p>
501 </dd>
503 --merge
504 </dt>
505 <dd>
506 <p>
507 Resets the index and updates the files in the working tree that are
509 different between the index and working tree (i.e. which have changes
510 which have not been added).
512 changes, reset is aborted.
513 </p>
514 <div class="paragraph"><p>In other words, --merge does something like a <em>git read-tree -u -m <commit></em>,
515 but carries forward unmerged index entries.</p></div>
516 </dd>
518 --keep
519 </dt>
520 <dd>
521 <p>
522 Resets index entries and updates files in the working tree that are
525 reset is aborted.
526 </p>
527 </dd>
528 </dl></div>
529 </dd>
530 </dl></div>
533 </div>
538 -q
539 </dt>
541 --quiet
542 </dt>
543 <dd>
544 <p>
545 Be quiet, only report errors.
546 </p>
547 </dd>
548 </dl></div>
549 </div>
554 Undo add
555 </dt>
556 <dd>
560 $ git add frotz.c filfre.c
564 </div></div>
566 <li>
567 <p>
568 You are happily working on something, and find the changes
569 in these files are in good order. You do not want to see them
570 when you run "git diff", because you plan to work on other files
571 and changes with these files are distracting.
572 </p>
573 </li>
574 <li>
575 <p>
576 Somebody asks you to pull, and the changes sounds worthy of merging.
577 </p>
578 </li>
579 <li>
580 <p>
581 However, you already dirtied the index (i.e. your index does
582 not match the HEAD commit). But you know the pull you are going
583 to make does not affect frotz.c nor filfre.c, so you revert the
584 index changes for these two files. Your changes in working tree
585 remain there.
586 </p>
587 </li>
588 <li>
589 <p>
590 Then you can pull and merge, leaving frotz.c and filfre.c
591 changes still in the working tree.
592 </p>
593 </li>
594 </ol></div>
595 </dd>
597 Undo a commit and redo
598 </dt>
599 <dd>
602 <pre><tt>$ git commit ...
606 </div></div>
608 <li>
609 <p>
610 This is most often done when you remembered what you
611 just committed is incomplete, or you misspelled your commit
612 message, or both. Leaves working tree as it was before "reset".
613 </p>
614 </li>
615 <li>
616 <p>
617 Make corrections to working tree files.
618 </p>
619 </li>
620 <li>
621 <p>
622 "reset" copies the old head to .git/ORIG_HEAD; redo the
623 commit by starting with its log message. If you do not need to
624 edit the message further, you can give -C option instead.
625 </p>
626 <div class="paragraph"><p>See also the --amend option to <a href="git-commit.html">git-commit(1)</a>.</p></div>
627 </li>
628 </ol></div>
629 </dd>
631 Undo a commit, making it a topic branch
632 </dt>
633 <dd>
639 </div></div>
641 <li>
642 <p>
643 You have made some commits, but realize they were premature
644 to be in the "master" branch. You want to continue polishing
645 them in a topic branch, so create "topic/wip" branch off of the
646 current HEAD.
647 </p>
648 </li>
649 <li>
650 <p>
651 Rewind the master branch to get rid of those three commits.
652 </p>
653 </li>
654 <li>
655 <p>
656 Switch to "topic/wip" branch and keep working.
657 </p>
658 </li>
659 </ol></div>
660 </dd>
662 Undo commits permanently
663 </dt>
664 <dd>
667 <pre><tt>$ git commit ...
669 </div></div>
671 <li>
672 <p>
673 The last three commits (HEAD, HEAD^, and HEAD~2) were bad
675 you have already given these commits to somebody else. (See the
677 the implications of doing so.)
678 </p>
679 </li>
680 </ol></div>
681 </dd>
683 Undo a merge or pull
684 </dt>
685 <dd>
689 Auto-merging nitfol
690 CONFLICT (content): Merge conflict in nitfol
691 Automatic merge failed; fix conflicts and then commit the result.
695 Fast-forward
697 </div></div>
699 <li>
700 <p>
701 Try to update from the upstream resulted in a lot of
702 conflicts; you were not ready to spend a lot of time merging
703 right now, so you decide to do that later.
704 </p>
705 </li>
706 <li>
707 <p>
709 which is a synonym for "git reset --hard HEAD" clears the mess
710 from the index file and the working tree.
711 </p>
712 </li>
713 <li>
714 <p>
715 Merge a topic branch into the current branch, which resulted
716 in a fast-forward.
717 </p>
718 </li>
719 <li>
720 <p>
721 But you decided that the topic branch is not ready for public
723 tip of the current branch in ORIG_HEAD, so resetting hard to it
724 brings your index file and the working tree back to that state,
725 and resets the tip of the branch to that commit.
726 </p>
727 </li>
728 </ol></div>
729 </dd>
731 Undo a merge or pull inside a dirty working tree
732 </dt>
733 <dd>
737 Auto-merging nitfol
738 Merge made by recursive.
739 nitfol | 20 +++++----
740 ...
742 </div></div>
744 <li>
745 <p>
746 Even if you may have local modifications in your
747 working tree, you can safely say "git pull" when you know
748 that the change in the other branch does not overlap with
749 them.
750 </p>
751 </li>
752 <li>
753 <p>
754 After inspecting the result of the merge, you may find
755 that the change in the other branch is unsatisfactory. Running
756 "git reset --hard ORIG_HEAD" will let you go back to where you
757 were, but it will discard your local changes, which you do not
758 want. "git reset --merge" keeps your local changes.
759 </p>
760 </li>
761 </ol></div>
762 </dd>
764 Interrupted workflow
765 </dt>
766 <dd>
768 are in the middle of a large change. The files in your
769 working tree are not in any shape to be committed yet, but you
770 need to get to the other branch for a quick bugfix.</p></div>
774 $ work work work ;# got interrupted
776 $ git checkout master
777 $ fix fix fix
778 $ git commit ;# commit with real log
779 $ git checkout feature
782 </div></div>
784 <li>
785 <p>
786 This commit will get blown away so a throw-away log message is OK.
787 </p>
788 </li>
789 <li>
790 <p>
792 your working tree to the state just before you made that snapshot.
793 </p>
794 </li>
795 <li>
796 <p>
797 At this point the index file still has all the WIP changes you
799 WIP files as uncommitted.
800 </p>
802 </li>
803 </ol></div>
804 </dd>
806 Reset a single file in the index
807 </dt>
808 <dd>
809 <div class="paragraph"><p>Suppose you have added a file to your index, but later decide you do not
810 want to add it to your commit. You can remove the file from the index
811 while keeping your changes with git reset.</p></div>
817 </div></div>
819 <li>
820 <p>
821 This removes the file from the index while keeping it in the working
822 directory.
823 </p>
824 </li>
825 <li>
826 <p>
827 This commits all other changes in the index.
828 </p>
829 </li>
830 <li>
831 <p>
832 Adds the file to the index again.
833 </p>
834 </li>
835 </ol></div>
836 </dd>
838 Keep changes in working tree while discarding some previous commits
839 </dt>
840 <dd>
842 continue working a bit more, but now you think that what you have in
843 your working tree should be in another branch that has nothing to do
844 with what you committed previously. You can start a new branch and
845 reset it while keeping the changes in your working tree.</p></div>
848 <pre><tt>$ git tag start
849 $ git checkout -b branch1
850 $ edit
852 $ edit
855 </div></div>
857 <li>
858 <p>
859 This commits your first edits in branch1.
860 </p>
861 </li>
862 <li>
863 <p>
864 In the ideal world, you could have realized that the earlier
865 commit did not belong to the new topic when you created and switched
866 to branch2 (i.e. "git checkout -b branch2 start"), but nobody is
867 perfect.
868 </p>
869 </li>
870 <li>
871 <p>
872 But you can use "reset --keep" to remove the unwanted commit after
873 you switched to "branch2".
874 </p>
875 </li>
876 </ol></div>
877 </dd>
878 </dl></div>
879 </div>
886 </div></div>
887 <div class="paragraph"><p>to reset the HEAD to another commit (<tt>target</tt>) with the different
888 reset options depending on the state of the files.</p></div>
890 file. For example, the first line of the first table means that if a
891 file is in state A in the working tree, in state B in the index, in
892 state C in HEAD and in state D in the target, then "git reset --soft
893 target" will leave the file in the working tree in state A and in the
894 index in state B. It resets (i.e. moves) the HEAD (i.e. the tip of
895 the current branch, if you are on one) to "target" (which has the file
896 in state D).</p></div>
899 <pre><tt>working index HEAD target working index HEAD
900 ----------------------------------------------------
901 A B C D --soft A B D
902 --mixed A D D
903 --hard D D D
904 --merge (disallowed)
905 --keep (disallowed)</tt></pre>
906 </div></div>
909 <pre><tt>working index HEAD target working index HEAD
910 ----------------------------------------------------
911 A B C C --soft A B C
912 --mixed A C C
913 --hard C C C
914 --merge (disallowed)
915 --keep A C C</tt></pre>
916 </div></div>
919 <pre><tt>working index HEAD target working index HEAD
920 ----------------------------------------------------
921 B B C D --soft B B D
922 --mixed B D D
923 --hard D D D
924 --merge D D D
925 --keep (disallowed)</tt></pre>
926 </div></div>
929 <pre><tt>working index HEAD target working index HEAD
930 ----------------------------------------------------
931 B B C C --soft B B C
932 --mixed B C C
933 --hard C C C
934 --merge C C C
935 --keep B C C</tt></pre>
936 </div></div>
939 <pre><tt>working index HEAD target working index HEAD
940 ----------------------------------------------------
941 B C C D --soft B C D
942 --mixed B D D
943 --hard D D D
944 --merge (disallowed)
945 --keep (disallowed)</tt></pre>
946 </div></div>
949 <pre><tt>working index HEAD target working index HEAD
950 ----------------------------------------------------
951 B C C C --soft B C C
952 --mixed B C C
953 --hard C C C
954 --merge B C C
955 --keep B C C</tt></pre>
956 </div></div>
957 <div class="paragraph"><p>"reset --merge" is meant to be used when resetting out of a conflicted
958 merge. Any mergy operation guarantees that the working tree file that is
959 involved in the merge does not have local change wrt the index before
960 it starts, and that it writes the result out to the working tree. So if
961 we see some difference between the index and the target and also
962 between the index and the working tree, then it means that we are not
963 resetting out from a state that a mergy operation left after failing
964 with a conflict. That is why we disallow --merge option in this case.</p></div>
966 commits in the current branch while keeping changes in the working
967 tree. If there could be conflicts between the changes in the commit we
968 want to remove and the changes in the working tree we want to keep,
969 the reset is disallowed. That’s why it is disallowed if there are both
970 changes between the working tree and HEAD, and between HEAD and the
971 target. To be safe, it is also disallowed when there are unmerged
972 entries.</p></div>
974 entries:</p></div>
977 <pre><tt>working index HEAD target working index HEAD
978 ----------------------------------------------------
979 X U A B --soft (disallowed)
980 --mixed X B B
981 --hard B B B
982 --merge B B B
983 --keep (disallowed)</tt></pre>
984 </div></div>
987 <pre><tt>working index HEAD target working index HEAD
988 ----------------------------------------------------
989 X U A A --soft (disallowed)
990 --mixed X A A
991 --hard A A A
992 --merge A A A
993 --keep (disallowed)</tt></pre>
994 </div></div>
996 </div>
999 <div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>> and Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div>
1000 </div>
1003 <div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div>
1004 </div>
1008 </div>
1012 </div>
1013 </div>
1014 </body>
1015 </html>