git-reset man page on Mandriva

Man page or keyword search:  
man Server   17060 pages
apropos Keyword Search (all sections)
Output format
Mandriva logo
[printable version]

GIT-RESET(1)			  Git Manual			  GIT-RESET(1)

NAME
       git-reset - Reset current HEAD to the specified state

SYNOPSIS
       git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
       git reset [-q] [<commit>] [--] <paths>...
       git reset --patch [<commit>] [--] [<paths>...]

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, git-
       revert(1) is your friend.

       The second and third forms with paths and/or --patch are used to revert
       selected paths in the index from a given commit, without moving HEAD.

OPTIONS
       --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.

       --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 "Changes to be committed", as git status 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
	   <commit> are lost.

       --merge
	   Resets the index to match the tree recorded by the named commit,
	   and updates the files that are different between the named commit
	   and the current commit in the working tree.

       --keep
	   Reset the index to the given commit, keeping local changes in the
	   working tree since the current commit, while updating working tree
	   files without local changes to what appears in the given commit. If
	   a file that is different between the current commit and the given
	   commit has local changes, reset is aborted.

       -p, --patch
	   Interactively select hunks in the difference between the index and
	   <commit> (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 (see
	   git-add(1)).

       -q, --quiet
	   Be quiet, only report errors.

       <commit>
	   Commit to make the current HEAD. If not given defaults to HEAD.

DISCUSSION
       The tables below show what happens when running:

	   git reset --option target

       to reset the HEAD to another commit (target) with the different reset
       options depending on the state of the files.

       In these tables, A, B, C and D are some different states of a file. For
       example, the first line of the first table means that if a file is in
       state A in the working tree, in state B in the index, in state C in
       HEAD and in state D in the target, then "git reset --soft target" will
       put the file in state A in the working tree, in state B in the index
       and in state D in HEAD.

	   working index HEAD target	     working index HEAD
	   ----------------------------------------------------
	    A	    B	  C    D     --soft   A	      B	    D
				     --mixed  A	      D	    D
				     --hard   D	      D	    D
				     --merge (disallowed)
				     --keep  (disallowed)

	   working index HEAD target	     working index HEAD
	   ----------------------------------------------------
	    A	    B	  C    C     --soft   A	      B	    C
				     --mixed  A	      C	    C
				     --hard   C	      C	    C
				     --merge (disallowed)
				     --keep   A	      C	    C

	   working index HEAD target	     working index HEAD
	   ----------------------------------------------------
	    B	    B	  C    D     --soft   B	      B	    D
				     --mixed  B	      D	    D
				     --hard   D	      D	    D
				     --merge  D	      D	    D
				     --keep  (disallowed)

	   working index HEAD target	     working index HEAD
	   ----------------------------------------------------
	    B	    B	  C    C     --soft   B	      B	    C
				     --mixed  B	      C	    C
				     --hard   C	      C	    C
				     --merge  C	      C	    C
				     --keep   B	      C	    C

	   working index HEAD target	     working index HEAD
	   ----------------------------------------------------
	    B	    C	  C    D     --soft   B	      C	    D
				     --mixed  B	      D	    D
				     --hard   D	      D	    D
				     --merge (disallowed)
				     --keep  (disallowed)

	   working index HEAD target	     working index HEAD
	   ----------------------------------------------------
	    B	    C	  C    C     --soft   B	      C	    C
				     --mixed  B	      C	    C
				     --hard   C	      C	    C
				     --merge  B	      C	    C
				     --keep   B	      C	    C

       "reset --merge" is meant to be used when resetting out of a conflicted
       merge. Any mergy operation guarantees that the work tree file that is
       involved in the merge does not have local change wrt the index before
       it starts, and that it writes the result out to the work tree. So if we
       see some difference between the index and the target and also between
       the index and the work tree, then it means that we are not resetting
       out from a state that a mergy operation left after failing with a
       conflict. That is why we disallow --merge option in this case.

       "reset --keep" is meant to be used when removing some of the last
       commits in the current branch while keeping changes in the working
       tree. If there could be conflicts between the changes in the commit we
       want to remove and the changes in the working tree we want to keep, the
       reset is disallowed. That’s why it is disallowed if there are both
       changes between the working tree and HEAD, and between HEAD and the
       target. To be safe, it is also disallowed when there are unmerged
       entries.

       The following tables show what happens when there are unmerged entries:

	   working index HEAD target	     working index HEAD
	   ----------------------------------------------------
	    X	    U	  A    B     --soft  (disallowed)
				     --mixed  X	      B	    B
				     --hard   B	      B	    B
				     --merge  B	      B	    B
				     --keep  (disallowed)

	   working index HEAD target	     working index HEAD
	   ----------------------------------------------------
	    X	    U	  A    A     --soft  (disallowed)
				     --mixed  X	      A	    A
				     --hard   A	      A	    A
				     --merge  A	      A	    A
				     --keep  (disallowed)

       X means any state and U means an unmerged index.

EXAMPLES
       Undo a commit and redo

	       $ git commit ...
	       $ git reset --soft HEAD^	     ▓fB(1)▓fR
	       $ edit			     ▓fB(2)▓fR
	       $ git commit -a -c ORIG_HEAD  ▓fB(3)▓fR

	   ⌂sp ▓fB1. ▓fRThis 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".
	   ⌂br ▓fB2. ▓fRMake corrections to working tree files.	 ⌂br ▓fB3.
	   ▓fR"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.

	   See also the --amend option to git-commit(1).  ⌂br

       Undo commits permanently

	       $ git commit ...
	       $ git reset --hard HEAD~3   ▓fB(1)▓fR

	   ⌂sp ▓fB1. ▓fRThe 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. (See the
	   "RECOVERING FROM UPSTREAM REBASE" section in git-rebase(1) for the
	   implications of doing so.)  ⌂br

       Undo a commit, making it a topic branch

	       $ git branch topic/wip	  ▓fB(1)▓fR
	       $ git reset --hard HEAD~3  ▓fB(2)▓fR
	       $ git checkout topic/wip	  ▓fB(3)▓fR

	   ⌂sp ▓fB1. ▓fRYou 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.	 ⌂br ▓fB2. ▓fRRewind the master branch to get
	   rid of those three commits.	⌂br ▓fB3. ▓fRSwitch to "topic/wip"
	   branch and keep working.  ⌂br

       Undo add

	       $ edit					  ▓fB(1)▓fR
	       $ git add frotz.c filfre.c
	       $ mailx					  ▓fB(2)▓fR
	       $ git reset				  ▓fB(3)▓fR
	       $ git pull git://info.example.com/ nitfol  ▓fB(4)▓fR

	   ⌂sp ▓fB1. ▓fRYou 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.	⌂br ▓fB2.
	   ▓fRSomebody asks you to pull, and the changes sounds worthy of
	   merging.  ⌂br ▓fB3. ▓fRHowever, 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.  ⌂br ▓fB4. ▓fRThen you can pull and
	   merge, leaving frotz.c and filfre.c changes still in the working
	   tree.  ⌂br

       Undo a merge or pull

	       $ git pull			  ▓fB(1)▓fR
	       Auto-merging nitfol
	       CONFLICT (content): Merge conflict in nitfol
	       Automatic merge failed; fix conflicts and then commit the result.
	       $ git reset --hardfB(2)▓fR
	       $ git pull . topic/branch	  ▓fB(3)▓fR
	       Updating from 41223... to 13134...
	       Fast-forward
	       $ git reset --hard ORIG_HEAD	  ▓fB(4)▓fR

	   ⌂sp ▓fB1. ▓fRTry to update from the upstream resulted in a lot of
	   conflicts; you were not ready to spend a lot of time merging right
	   now, so you decide to do that later.	 ⌂br ▓fB2. ▓fR"pull" has not
	   made merge commit, so "git reset --hard" which is a synonym for
	   "git reset --hard HEAD" clears the mess from the index file and the
	   working tree.  ⌂br ▓fB3. ▓fRMerge a topic branch into the current
	   branch, which resulted in a fast-forward.  ⌂br ▓fB4. ▓fRBut you
	   decided that the topic branch is not ready for public consumption
	   yet. "pull" or "merge" always leaves the original tip of the
	   current branch in ORIG_HEAD, so resetting hard to it brings your
	   index file and the working tree back to that state, and resets the
	   tip of the branch to that commit.  ⌂br

       Undo a merge or pull inside a dirty work tree

	       $ git pull			  ▓fB(1)▓fR
	       Auto-merging nitfol
	       Merge made by recursive.
		nitfol		      |	  20 +++++----
		...
	       $ git reset --merge ORIG_HEAD	  ▓fB(2)▓fR

	   ⌂sp ▓fB1. ▓fREven if you may have local modifications in your
	   working tree, you can safely say "git pull" when you know that the
	   change in the other branch does not overlap with them.  ⌂br ▓fB2.
	   ▓fRAfter inspecting the result of the merge, you may find that the
	   change in the other branch is unsatisfactory. Running "git reset
	   --hard ORIG_HEAD" will let you go back to where you were, but it
	   will discard your local changes, which you do not want. "git reset
	   --merge" keeps your local changes.  ⌂br

       Interrupted workflow
	   Suppose you are interrupted by an urgent fix request while you are
	   in the middle of a large change. The files in your working tree are
	   not in any shape to be committed yet, but you need to get to the
	   other branch for a quick bugfix.

	       $ git checkout feature ;# you were working in "feature" branch and
	       $ work work work	      ;# got interrupted
	       $ git commit -a -m "snapshot WIP"		 ▓fB(1)▓fR
	       $ git checkout master
	       $ fix fix fix
	       $ git commit ;# commit with real log
	       $ git checkout feature
	       $ git reset --soft HEAD^ ;# go back to WIP state	 ▓fB(2)▓fR
	       $ git reset					 ▓fB(3)▓fR

	   ⌂sp ▓fB1. ▓fRThis commit will get blown away so a throw-away log
	   message is OK.  ⌂br ▓fB2. ▓fRThis removes the WIP commit from the
	   commit history, and sets your working tree to the state just before
	   you made that snapshot.  ⌂br ▓fB3. ▓fRAt this point the index file
	   still has all the WIP changes you committed as snapshot WIP. This
	   updates the index to show your WIP files as uncommitted.

	   See also git-stash(1).  ⌂br

       Reset a single file in the index
	   Suppose you have added a file to your index, but later decide you
	   do not want to add it to your commit. You can remove the file from
	   the index while keeping your changes with git reset.

	       $ git reset -- frotz.c			   ▓fB(1)▓fR
	       $ git commit -m "Commit files in index"	   ▓fB(2)▓fR
	       $ git add frotz.c			   ▓fB(3)▓fR

	   ⌂sp ▓fB1. ▓fRThis removes the file from the index while keeping it
	   in the working directory.  ⌂br ▓fB2. ▓fRThis commits all other
	   changes in the index.  ⌂br ▓fB3. ▓fRAdds the file to the index
	   again.  ⌂br

       Keep changes in working tree while discarding some previous commits
	   Suppose you are working on something and you commit it, and then
	   you continue working a bit more, but now you think that what you
	   have in your working tree should be in another branch that has
	   nothing to do with what you commited previously. You can start a
	   new branch and reset it while keeping the changes in your work
	   tree.

	       $ git tag start
	       $ git checkout -b branch1
	       $ edit
	       $ git commit ...				   ▓fB(1)▓fR
	       $ edit
	       $ git checkout -b branch2		   ▓fB(2)▓fR
	       $ git reset --keep start			   ▓fB(3)▓fR

	   ⌂sp ▓fB1. ▓fRThis commits your first edits in branch1.  ⌂br ▓fB2.
	   ▓fRIn the ideal world, you could have realized that the earlier
	   commit did not belong to the new topic when you created and
	   switched to branch2 (i.e. "git checkout -b branch2 start"), but
	   nobody is perfect.  ⌂br ▓fB3. ▓fRBut you can use "reset --keep" to
	   remove the unwanted commit after you switched to "branch2".	⌂br

AUTHOR
       Written by Junio C Hamano <gitster@pobox.com[1]> and Linus Torvalds
       <torvalds@osdl.org[2]>

DOCUMENTATION
       Documentation by Junio C Hamano and the git-list
       <git@vger.kernel.org[3]>.

GIT
       Part of the git(1) suite

NOTES
	1. gitster@pobox.com
	   mailto:gitster@pobox.com

	2. torvalds@osdl.org
	   mailto:torvalds@osdl.org

	3. git@vger.kernel.org
	   mailto:git@vger.kernel.org

Git 1.7.1			  12/16/2010			  GIT-RESET(1)
[top]

List of man pages available for Mandriva

Copyright (c) for man pages and the logo by the respective OS vendor.

For those who want to learn more, the polarhome community provides shell access and support.

[legal] [privacy] [GNU] [policy] [cookies] [netiquette] [sponsors] [FAQ]
Tweet
Polarhome, production since 1999.
Member of Polarhome portal.
Based on Fawad Halim's script.
....................................................................
Vote for polarhome
Free Shell Accounts :: the biggest list on the net