Code

[PATCH] Extend "git reset" to take a reset point
authorLinus Torvalds <torvalds@osdl.org>
Sun, 7 Aug 2005 01:01:03 +0000 (18:01 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 7 Aug 2005 03:44:20 +0000 (20:44 -0700)
commitbfe19f876cb20bea606e1a698030c017f31965c1
treee69d7b2fa8b592c95dc77861fb3e83e85c19172e
parentd3af621b147bb90a31fdc3b55e07853f45deb658
[PATCH] Extend "git reset" to take a reset point

This was triggered by a query by Sam Ravnborg, and extends "git reset" to
reset the index and the .git/HEAD pointer to an arbitrarily named point.

For example

git reset HEAD^

will just reset the current HEAD to its own parent - leaving the working
directory untouched, but effectively un-doing the top-most commit. You
might want to do this if you realize after you committed that you made a
mistake that you want to fix up: reset your HEAD back to its previous
state, fix up the working directory and re-do the commit.

If you want to totally un-do the commit (and reset your working directory
to that point too), you'd first use "git reset HEAD^" to reset to the
parent, and then do a "git checkout -f" to reset the working directory
state to that point in time too.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-reset-script