NAME git-reset - Reset current HEAD to the specified state SYNOPSIS git reset [-q] [] [--] … git reset (--patch | -p) [] [--] […] git reset [--soft | --mixed | --hard | --merge | --keep] [-q] [] DESCRIPTION In the first and second form, copy entries from to the index. In the third form, set the current branch head (HEAD) to , optionally modifying index and working tree to match. The defaults to HEAD in all forms. git reset [-q] [] [--] … This form resets the index entries for all to their state at . (It does not affect the working tree, nor the current branch.) This means that git reset is the opposite of git add . After running git reset to update the index entry, you can use git-checkout(1) to check the contents out of the index to the working tree. Alternatively, using git-checkout(1) and specifying a commit, you can copy the contents of a path out of a commit to the index and to the working tree in one go. git reset (--patch | -p) [] [--] […] Interactively select hunks in the difference between the index and (defaults to HEAD). The chosen hunks are applied in reverse to the index. This means that git reset -p is the opposite of git add -p, i.e. you can use it to selectively reset hunks. See the `Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch mode. git reset [] [] This form resets the current branch head to and possibly updates the index (resetting it to the tree of ) and the working tree depending on . If is omitted, defaults to "--mixed". The must be one of the following: --soft Does not touch the index file nor the working tree at all (but resets the head to , just like all modes do). This leaves all your changed files "Changes to be committed", as git status would put it. --mixed Resets the index but not the working tree (i.e., the changed files are preserved but not marked for commit) and reports what has not been updated. This is the default action. --hard Resets the index and working tree. Any changes to tracked files in the working tree since are discarded. --merge Resets the index and updates the files in the working tree that are different between and HEAD, but keeps those which are different between the index and working tree (i.e. which have changes which have not been added). If a file that is different between and the index has unstaged changes, reset is aborted. In other words, --merge does something like a git read-tree -u -m , but carries forward unmerged index entries. --keep Resets index entries and updates files in the working tree that are different between and HEAD. If a file that is different between and HEAD has local changes, reset is aborted. If you want to undo a commit other than the latest on a branch, git-revert(1) is your friend. OPTIONS -q --quiet Be quiet, only report errors. EXAMPLES Undo add $ edit <1> $ git add frotz.c filfre.c $ mailx <2> $ git reset <3> $ git pull git://info.example.com/ nitfol <4> 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. Somebody asks you to pull, and the changes sounds worthy of merging. 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. Then you can pull and merge, leaving frotz.c and filfre.c changes still in the working tree. Undo a commit and redo $ git commit ... $ git reset --soft HEAD^ <1> $ edit <2>NAME git-reset - Reset current HEAD to the specified state SYNOPSIS git reset [-q] [] [--] … git reset (--patch | -p) [] [--] […] git reset [--soft | --mixed | --hard | --merge | --keep] [-q] [] DESCRIPTION In the first and second form, copy entries from to the index. In the third form, set the current branch head (HEAD) to , optionally modifying index and working tree to match. The defaults to HEAD in all forms. git reset [-q] [] [--] … This form resets the index entries for all to their state at . (It does not affect the working tree, nor the current branch.) This means that git reset is the opposite of git add . After running git reset to update the index entry, you can use git-checkout(1) to check the contents out of the index to the working tree. Alternatively, using git-checkout(1) and specifying a commit, you can copy the contents of a path out of a commit to the index and to the working tree in one go. git reset (--patch | -p) [] [--] […] Interactively select hunks in the difference between the index and (defaults to HEAD). The chosen hunks are applied in reverse to the index. This means that git reset -p is the opposite of git add -p, i.e. you can use it to selectively reset hunks. See the `Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch mode. git reset [] [] This form resets the current branch head to and possibly updates the index (resetting it to the tree of ) and the working tree depending on . If is omitted, defaults to "--mixed". The must be one of the following: --soft Does not touch the index file nor the working tree at all (but resets the head to , just like all modes do). This leaves all your changed files "Changes to be committed", as git status would put it. --mixed Resets the index but not the working tree (i.e., the changed files are preserved but not marked for commit) and reports what has not been updated. This is the default action. --hard Resets the index and working tree. Any changes to tracked files in the working tree since are discarded. --merge Resets the index and updates the files in the working tree that are different between and HEAD, but keeps those which are different between the index and working tree (i.e. which have changes which have not been added). If a file that is different between and the index has unstaged changes, reset is aborted. In other words, --merge does something like a git read-tree -u -m , but carries forward unmerged index entries. --keep Resets index entries and updates files in the working tree that are different between and HEAD. If a file that is different between and HEAD has local changes, reset is aborted. If you want to undo a commit other than the latest on a branch, git-revert(1) is your friend. OPTIONS -q --quiet Be quiet, only report errors. EXAMPLES Undo add $ edit <1> $ git add frotz.c filfre.c $ mailx <2> $ git reset <3> $ git pull git://info.example.com/ nitfol <4> 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. Somebody asks you to pull, and the changes sounds worthy of merging. 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. Then you can pull and merge, leaving frotz.c and filfre.c changes still in the working tree. Undo a commit and redo $ git commit ... $ git reset --soft HEAD^ <1> $ edit <2> $ git commit -a $ git commit -a
