| blob | 0f2411410ed4da7cc23172151402748362dd630c |
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>, i.e.
460 section of <a href="git-add.html">git-add(1)</a> to learn how to operate the <tt>--patch</tt> mode.</p></div>
461 </dd>
464 </dt>
465 <dd>
466 <p>
470 must be one of the following:
471 </p>
474 --soft
475 </dt>
476 <dd>
477 <p>
478 Does not touch the index file nor the working tree at all (but
481 would put it.
482 </p>
483 </dd>
485 --mixed
486 </dt>
487 <dd>
488 <p>
489 Resets the index but not the working tree (i.e., the changed files
490 are preserved but not marked for commit) and reports what has not
491 been updated. This is the default action.
492 </p>
493 </dd>
495 --hard
496 </dt>
497 <dd>
498 <p>
499 Resets the index and working tree. Any changes to tracked files in the
501 </p>
502 </dd>
504 --merge
505 </dt>
506 <dd>
507 <p>
508 Resets the index and updates the files in the working tree that are
510 different between the index and working tree (i.e. which have changes
511 which have not been added).
513 changes, reset is aborted.
514 </p>
515 <div class="paragraph"><p>In other words, --merge does something like a <em>git read-tree -u -m <commit></em>,
516 but carries forward unmerged index entries.</p></div>
517 </dd>
519 --keep
520 </dt>
521 <dd>
522 <p>
523 Resets index entries and updates files in the working tree that are
526 reset is aborted.
527 </p>
528 </dd>
529 </dl></div>
530 </dd>
531 </dl></div>
534 </div>
539 -q
540 </dt>
542 --quiet
543 </dt>
544 <dd>
545 <p>
546 Be quiet, only report errors.
547 </p>
548 </dd>
549 </dl></div>
550 </div>
555 Undo add
556 </dt>
557 <dd>
561 $ git add frotz.c filfre.c
565 </div></div>
567 <li>
568 <p>
569 You are happily working on something, and find the changes
570 in these files are in good order. You do not want to see them
571 when you run "git diff", because you plan to work on other files
572 and changes with these files are distracting.
573 </p>
574 </li>
575 <li>
576 <p>
577 Somebody asks you to pull, and the changes sounds worthy of merging.
578 </p>
579 </li>
580 <li>
581 <p>
582 However, you already dirtied the index (i.e. your index does
583 not match the HEAD commit). But you know the pull you are going
584 to make does not affect frotz.c nor filfre.c, so you revert the
585 index changes for these two files. Your changes in working tree
586 remain there.
587 </p>
588 </li>
589 <li>
590 <p>
591 Then you can pull and merge, leaving frotz.c and filfre.c
592 changes still in the working tree.
593 </p>
594 </li>
595 </ol></div>
596 </dd>
598 Undo a commit and redo
599 </dt>
600 <dd>
603 <pre><tt>$ git commit ...
607 </div></div>
609 <li>
610 <p>
611 This is most often done when you remembered what you
612 just committed is incomplete, or you misspelled your commit
613 message, or both. Leaves working tree as it was before "reset".
614 </p>
615 </li>
616 <li>
617 <p>
618 Make corrections to working tree files.
619 </p>
620 </li>
621 <li>
622 <p>
623 "reset" copies the old head to .git/ORIG_HEAD; redo the
624 commit by starting with its log message. If you do not need to
625 edit the message further, you can give -C option instead.
626 </p>
627 <div class="paragraph"><p>See also the --amend option to <a href="git-commit.html">git-commit(1)</a>.</p></div>
628 </li>
629 </ol></div>
630 </dd>
632 Undo a commit, making it a topic branch
633 </dt>
634 <dd>
640 </div></div>
642 <li>
643 <p>
644 You have made some commits, but realize they were premature
645 to be in the "master" branch. You want to continue polishing
646 them in a topic branch, so create "topic/wip" branch off of the
647 current HEAD.
648 </p>
649 </li>
650 <li>
651 <p>
652 Rewind the master branch to get rid of those three commits.
653 </p>
654 </li>
655 <li>
656 <p>
657 Switch to "topic/wip" branch and keep working.
658 </p>
659 </li>
660 </ol></div>
661 </dd>
663 Undo commits permanently
664 </dt>
665 <dd>
668 <pre><tt>$ git commit ...
670 </div></div>
672 <li>
673 <p>
674 The last three commits (HEAD, HEAD^, and HEAD~2) were bad
676 you have already given these commits to somebody else. (See the
678 the implications of doing so.)
679 </p>
680 </li>
681 </ol></div>
682 </dd>
684 Undo a merge or pull
685 </dt>
686 <dd>
690 Auto-merging nitfol
691 CONFLICT (content): Merge conflict in nitfol
692 Automatic merge failed; fix conflicts and then commit the result.
696 Fast-forward
698 </div></div>
700 <li>
701 <p>
702 Try to update from the upstream resulted in a lot of
703 conflicts; you were not ready to spend a lot of time merging
704 right now, so you decide to do that later.
705 </p>
706 </li>
707 <li>
708 <p>
710 which is a synonym for "git reset --hard HEAD" clears the mess
711 from the index file and the working tree.
712 </p>
713 </li>
714 <li>
715 <p>
716 Merge a topic branch into the current branch, which resulted
717 in a fast-forward.
718 </p>
719 </li>
720 <li>
721 <p>
722 But you decided that the topic branch is not ready for public
724 tip of the current branch in ORIG_HEAD, so resetting hard to it
725 brings your index file and the working tree back to that state,
726 and resets the tip of the branch to that commit.
727 </p>
728 </li>
729 </ol></div>
730 </dd>
732 Undo a merge or pull inside a dirty working tree
733 </dt>
734 <dd>
738 Auto-merging nitfol
739 Merge made by recursive.
740 nitfol | 20 +++++----
741 ...
743 </div></div>
745 <li>
746 <p>
747 Even if you may have local modifications in your
748 working tree, you can safely say "git pull" when you know
749 that the change in the other branch does not overlap with
750 them.
751 </p>
752 </li>
753 <li>
754 <p>
755 After inspecting the result of the merge, you may find
756 that the change in the other branch is unsatisfactory. Running
757 "git reset --hard ORIG_HEAD" will let you go back to where you
758 were, but it will discard your local changes, which you do not
759 want. "git reset --merge" keeps your local changes.
760 </p>
761 </li>
762 </ol></div>
763 </dd>
765 Interrupted workflow
766 </dt>
767 <dd>
769 are in the middle of a large change. The files in your
770 working tree are not in any shape to be committed yet, but you
771 need to get to the other branch for a quick bugfix.</p></div>
775 $ work work work ;# got interrupted
777 $ git checkout master
778 $ fix fix fix
779 $ git commit ;# commit with real log
780 $ git checkout feature
783 </div></div>
785 <li>
786 <p>
787 This commit will get blown away so a throw-away log message is OK.
788 </p>
789 </li>
790 <li>
791 <p>
793 your working tree to the state just before you made that snapshot.
794 </p>
795 </li>
796 <li>
797 <p>
798 At this point the index file still has all the WIP changes you
800 WIP files as uncommitted.
801 </p>
803 </li>
804 </ol></div>
805 </dd>
807 Reset a single file in the index
808 </dt>
809 <dd>
810 <div class="paragraph"><p>Suppose you have added a file to your index, but later decide you do not
811 want to add it to your commit. You can remove the file from the index
812 while keeping your changes with git reset.</p></div>
818 </div></div>
820 <li>
821 <p>
822 This removes the file from the index while keeping it in the working
823 directory.
824 </p>
825 </li>
826 <li>
827 <p>
828 This commits all other changes in the index.
829 </p>
830 </li>
831 <li>
832 <p>
833 Adds the file to the index again.
834 </p>
835 </li>
836 </ol></div>
837 </dd>
839 Keep changes in working tree while discarding some previous commits
840 </dt>
841 <dd>
843 continue working a bit more, but now you think that what you have in
844 your working tree should be in another branch that has nothing to do
845 with what you committed previously. You can start a new branch and
846 reset it while keeping the changes in your working tree.</p></div>
849 <pre><tt>$ git tag start
850 $ git checkout -b branch1
851 $ edit
853 $ edit
856 </div></div>
858 <li>
859 <p>
860 This commits your first edits in branch1.
861 </p>
862 </li>
863 <li>
864 <p>
865 In the ideal world, you could have realized that the earlier
866 commit did not belong to the new topic when you created and switched
867 to branch2 (i.e. "git checkout -b branch2 start"), but nobody is
868 perfect.
869 </p>
870 </li>
871 <li>
872 <p>
873 But you can use "reset --keep" to remove the unwanted commit after
874 you switched to "branch2".
875 </p>
876 </li>
877 </ol></div>
878 </dd>
879 </dl></div>
880 </div>
887 </div></div>
888 <div class="paragraph"><p>to reset the HEAD to another commit (<tt>target</tt>) with the different
889 reset options depending on the state of the files.</p></div>
891 file. For example, the first line of the first table means that if a
892 file is in state A in the working tree, in state B in the index, in
893 state C in HEAD and in state D in the target, then "git reset --soft
894 target" will leave the file in the working tree in state A and in the
895 index in state B. It resets (i.e. moves) the HEAD (i.e. the tip of
896 the current branch, if you are on one) to "target" (which has the file
897 in state D).</p></div>
900 <pre><tt>working index HEAD target working index HEAD
901 ----------------------------------------------------
902 A B C D --soft A B D
903 --mixed A D D
904 --hard D D D
905 --merge (disallowed)
906 --keep (disallowed)</tt></pre>
907 </div></div>
910 <pre><tt>working index HEAD target working index HEAD
911 ----------------------------------------------------
912 A B C C --soft A B C
913 --mixed A C C
914 --hard C C C
915 --merge (disallowed)
916 --keep A C C</tt></pre>
917 </div></div>
920 <pre><tt>working index HEAD target working index HEAD
921 ----------------------------------------------------
922 B B C D --soft B B D
923 --mixed B D D
924 --hard D D D
925 --merge D D D
926 --keep (disallowed)</tt></pre>
927 </div></div>
930 <pre><tt>working index HEAD target working index HEAD
931 ----------------------------------------------------
932 B B C C --soft B B C
933 --mixed B C C
934 --hard C C C
935 --merge C C C
936 --keep B C C</tt></pre>
937 </div></div>
940 <pre><tt>working index HEAD target working index HEAD
941 ----------------------------------------------------
942 B C C D --soft B C D
943 --mixed B D D
944 --hard D D D
945 --merge (disallowed)
946 --keep (disallowed)</tt></pre>
947 </div></div>
950 <pre><tt>working index HEAD target working index HEAD
951 ----------------------------------------------------
952 B C C C --soft B C C
953 --mixed B C C
954 --hard C C C
955 --merge B C C
956 --keep B C C</tt></pre>
957 </div></div>
958 <div class="paragraph"><p>"reset --merge" is meant to be used when resetting out of a conflicted
959 merge. Any mergy operation guarantees that the working tree file that is
960 involved in the merge does not have local change wrt the index before
961 it starts, and that it writes the result out to the working tree. So if
962 we see some difference between the index and the target and also
963 between the index and the working tree, then it means that we are not
964 resetting out from a state that a mergy operation left after failing
965 with a conflict. That is why we disallow --merge option in this case.</p></div>
967 commits in the current branch while keeping changes in the working
968 tree. If there could be conflicts between the changes in the commit we
969 want to remove and the changes in the working tree we want to keep,
970 the reset is disallowed. That’s why it is disallowed if there are both
971 changes between the working tree and HEAD, and between HEAD and the
972 target. To be safe, it is also disallowed when there are unmerged
973 entries.</p></div>
975 entries:</p></div>
978 <pre><tt>working index HEAD target working index HEAD
979 ----------------------------------------------------
980 X U A B --soft (disallowed)
981 --mixed X B B
982 --hard B B B
983 --merge B B B
984 --keep (disallowed)</tt></pre>
985 </div></div>
988 <pre><tt>working index HEAD target working index HEAD
989 ----------------------------------------------------
990 X U A A --soft (disallowed)
991 --mixed X A A
992 --hard A A A
993 --merge A A A
994 --keep (disallowed)</tt></pre>
995 </div></div>
997 </div>
1001 </div>
1005 </div>
1006 </div>
1007 </body>
1008 </html>