1git-reset(1) 2============ 3 4NAME 5---- 6git-reset - Reset current HEAD to the specified state 7 8SYNOPSIS 9-------- 10[verse] 11'git reset' [--mixed | --soft | --hard] [-q] [<commit>] 12'git reset' [-q] [<commit>] [--] <paths>... 13 14DESCRIPTION 15----------- 16Sets the current head to the specified commit and optionally resets the 17index and working tree to match. 18 19This command is useful if you notice some small error in a recent 20commit (or set of commits) and want to redo that part without showing 21the undo in the history. 22 23If you want to undo a commit other than the latest on a branch, 24linkgit:git-revert[1] is your friend. 25 26The second form with 'paths' is used to revert selected paths in 27the index from a given commit, without moving HEAD. 28 29 30OPTIONS 31------- 32--mixed:: 33 Resets the index but not the working tree (i.e., the changed files 34 are preserved but not marked for commit) and reports what has not 35 been updated. This is the default action. 36 37--soft:: 38 Does not touch the index file nor the working tree at all, but 39 requires them to be in a good order. This leaves all your changed 40 files "Changes to be committed", as 'git-status' would 41 put it. 42 43--hard:: 44 Matches the working tree and index to that of the tree being 45 switched to. Any changes to tracked files in the working tree 46 since <commit> are lost. 47 48-q:: 49 Be quiet, only report errors. 50 51<commit>:: 52 Commit to make the current HEAD. If not given defaults to HEAD. 53 54Examples 55-------- 56 57Undo a commit and redo:: 58+ 59------------ 60$ git commit ... 61$ git reset --soft HEAD^ <1> 62$ edit <2> 63$ git commit -a -c ORIG_HEAD <3> 64------------ 65+ 66<1> This is most often done when you remembered what you 67just committed is incomplete, or you misspelled your commit 68message, or both. Leaves working tree as it was before "reset". 69<2> Make corrections to working tree files. 70<3> "reset" copies the old head to .git/ORIG_HEAD; redo the 71commit by starting with its log message. If you do not need to 72edit the message further, you can give -C option instead. 73+ 74See also the --amend option to linkgit:git-commit[1]. 75 76Undo commits permanently:: 77+ 78------------ 79$ git commit ... 80$ git reset --hard HEAD~3 <1> 81------------ 82+ 83<1> The last three commits (HEAD, HEAD^, and HEAD~2) were bad 84and you do not want to ever see them again. Do *not* do this if 85you have already given these commits to somebody else. (See the 86"RECOVERING FROM UPSTREAM REBASE" section in linkgit:git-rebase[1] for 87the implications of doing so.) 88 89Undo a commit, making it a topic branch:: 90+ 91------------ 92$ git branch topic/wip <1> 93$ git reset --hard HEAD~3 <2> 94$ git checkout topic/wip <3> 95------------ 96+ 97<1> You have made some commits, but realize they were premature 98to be in the "master" branch. You want to continue polishing 99them in a topic branch, so create "topic/wip" branch off of the 100current HEAD. 101<2> Rewind the master branch to get rid of those three commits. 102<3> Switch to "topic/wip" branch and keep working. 103 104Undo add:: 105+ 106------------ 107$ edit <1> 108$ git add frotz.c filfre.c 109$ mailx <2> 110$ git reset <3> 111$ git pull git://info.example.com/ nitfol <4> 112------------ 113+ 114<1> You are happily working on something, and find the changes 115in these files are in good order. You do not want to see them 116when you run "git diff", because you plan to work on other files 117and changes with these files are distracting. 118<2> Somebody asks you to pull, and the changes sounds worthy of merging. 119<3> However, you already dirtied the index (i.e. your index does 120not match the HEAD commit). But you know the pull you are going 121to make does not affect frotz.c nor filfre.c, so you revert the 122index changes for these two files. Your changes in working tree 123remain there. 124<4> Then you can pull and merge, leaving frotz.c and filfre.c 125changes still in the working tree. 126 127Undo a merge or pull:: 128+ 129------------ 130$ git pull <1> 131Auto-merging nitfol 132CONFLICT (content): Merge conflict in nitfol 133Automatic merge failed/prevented; fix up by hand 134$ git reset --hard <2> 135$ git pull . topic/branch <3> 136Updating from 41223... to 13134... 137Fast forward 138$ git reset --hard ORIG_HEAD <4> 139------------ 140+ 141<1> Try to update from the upstream resulted in a lot of 142conflicts; you were not ready to spend a lot of time merging 143right now, so you decide to do that later. 144<2> "pull" has not made merge commit, so "git reset --hard" 145which is a synonym for "git reset --hard HEAD" clears the mess 146from the index file and the working tree. 147<3> Merge a topic branch into the current branch, which resulted 148in a fast forward. 149<4> But you decided that the topic branch is not ready for public 150consumption yet. "pull" or "merge" always leaves the original 151tip of the current branch in ORIG_HEAD, so resetting hard to it 152brings your index file and the working tree back to that state, 153and resets the tip of the branch to that commit. 154 155Interrupted workflow:: 156+ 157Suppose you are interrupted by an urgent fix request while you 158are in the middle of a large change. The files in your 159working tree are not in any shape to be committed yet, but you 160need to get to the other branch for a quick bugfix. 161+ 162------------ 163$ git checkout feature ;# you were working in "feature" branch and 164$ work work work ;# got interrupted 165$ git commit -a -m "snapshot WIP" <1> 166$ git checkout master 167$ fix fix fix 168$ git commit ;# commit with real log 169$ git checkout feature 170$ git reset --soft HEAD^ ;# go back to WIP state <2> 171$ git reset <3> 172------------ 173+ 174<1> This commit will get blown away so a throw-away log message is OK. 175<2> This removes the 'WIP' commit from the commit history, and sets 176 your working tree to the state just before you made that snapshot. 177<3> At this point the index file still has all the WIP changes you 178 committed as 'snapshot WIP'. This updates the index to show your 179 WIP files as uncommitted. 180 181Reset a single file in the index:: 182+ 183Suppose you have added a file to your index, but later decide you do not 184want to add it to your commit. You can remove the file from the index 185while keeping your changes with git reset. 186+ 187------------ 188$ git reset -- frotz.c <1> 189$ git commit -m "Commit files in index" <2> 190$ git add frotz.c <3> 191------------ 192+ 193<1> This removes the file from the index while keeping it in the working 194 directory. 195<2> This commits all other changes in the index. 196<3> Adds the file to the index again. 197 198Author 199------ 200Written by Junio C Hamano <gitster@pobox.com> and Linus Torvalds <torvalds@osdl.org> 201 202Documentation 203-------------- 204Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. 205 206GIT 207--- 208Part of the linkgit:git[1] suite