git-reset(1) ============ NAME ---- git-reset - Reset current HEAD to the specified state. SYNOPSIS -------- 'git-reset' [--mixed | --soft | --hard] [] DESCRIPTION ----------- Sets the current head to the specified commit and optionally resets the index and working tree to match. This command is useful if you notice some small error in a recent commit (or set of commits) and want to redo that part without showing the undo in the history. If you want to undo a commit other than the latest on a branch, gitlink:git-revert[1] is your friend. OPTIONS ------- --mixed:: Resets the index but not the working tree (ie, the changed files are preserved but not marked for commit) and reports what has not been updated. This is the default action. --soft:: Does not touch the index file nor the working tree at all, but requires them to be in a good order. This leaves all your changed files "Updated but not checked in", as gitlink:git-status[1] would put it. --hard:: Matches the working tree and index to that of the tree being switched to. Any changes to tracked files in the working tree since are lost. :: Commit to make the current HEAD. Examples ~~~~~~~~ Undo a commit and redo:: + ------------ $ git commit ... $ git reset --soft HEAD^ <1> $ edit <2> $ git commit -a -c ORIG_HEAD <3> <1> This is most often done when you remembered what you just committed is incomplete, or you misspelled your commit message, or both. Leaves working tree as it was before "reset". <2> make corrections to working tree files. <3> "reset" copies the old head to .git/ORIG_HEAD; redo the commit by starting with its log message. If you do not need to edit the message further, you can give -C option instead. ------------ Undo commits permanently:: + ------------ $ git commit ... $ git reset --hard HEAD~3 <1> <1> The last three commits (HEAD, HEAD^, and HEAD~2) were bad and you do not want to ever see them again. Do *not* do this if you have already given these commits to somebody else. ------------ Undo a commit, making it a topic branch:: + ------------ $ git branch topic/wip <1> $ git reset --hard HEAD~3 <2> $ git checkout topic/wip <3> <1> You have made some commits, but realize they were premature to be in the "master" branch. You want to continue polishing them in a topic branch, so create "topic/wip" branch off of the current HEAD. <2> Rewind the master branch to get rid of those three commits. <3> Switch to "topic/wip" branch and keep working. ------------ Undo update-index:: + ------------ $ edit <1> $ git-update-index frotz.c filfre.c $ mailx <2> $ git reset <3> $ git pull git://info.example.com/ nitfol <4> <1> you are happily working on something, and find the changes in these files are in good order. You do not want to see them when you run "git diff", because you plan to work on other files and changes with these files are distracting. <2> somebody asks you to pull, and the changes sounds worthy of merging. <3> however, you already dirtied the index (i.e. your index does not match the HEAD commit). But you know the pull you are going to make does not affect frotz.c nor filfre.c, so you revert the index changes for these two files. Your changes in working tree remain there. <4> then you can pull and merge, leaving frotz.c and filfre.c changes still in the working tree. ------------ Author ------ Written by Junio C Hamano and Linus Torvalds Documentation -------------- Documentation by Junio C Hamano and the git-list . GIT --- Part of the gitlink:git[7] suite