git-commit-vandalism/git-reset-script

#!/bin/sh
. git-sh-setup-script || die "Not a git archive"
rev=$(git-rev-parse --revs-only --verify --default HEAD "$@") || exit
rev=$(git-rev-parse --revs-only --verify $rev^0) || exit
git-read-tree --reset "$rev" && {
	if orig=$(git-rev-parse --verify HEAD 2>/dev/null)
	then
		echo "$orig" >"$GIT_DIR/ORIG_HEAD"
	fi
	echo "$rev" > "$GIT_DIR/HEAD"
}
git-update-cache --refresh
rm -f "$GIT_DIR/MERGE_HEAD"
Trivial git script fixups Fix permissions, and add trivial "reset" and "add" scripts. The "reset" script just resets the index back to head, while the "add" script is just a crutch for people used to do "cvs add". 2005-06-15 03:56:05 +02:00			`#!/bin/sh`
Add "git-sh-setup-script" for common git shell script setup It sets up the normal git environment variables and a few helper functions (currently just "die()"), and returns ok if it all looks like a git archive. So use it something like . git-sh-setup-script \|\| die "Not a git archive" to make the rest of the git scripts more careful and readable. 2005-07-08 19:57:21 +02:00			`. git-sh-setup-script \|\| die "Not a git archive"`
[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> 2005-08-07 03:01:03 +02:00			`rev=$(git-rev-parse --revs-only --verify --default HEAD "$@") \|\| exit`
			`rev=$(git-rev-parse --revs-only --verify $rev^0) \|\| exit`
Stash away the original head in ORIG_HEAD when resetting. When rewinding the head, stash away the value of the original HEAD in ORIG_HEAD, just like git-resolve-script does. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-08-07 05:59:47 +02:00			`git-read-tree --reset "$rev" && {`
			`if orig=$(git-rev-parse --verify HEAD 2>/dev/null)`
			`then`
			`echo "$orig" >"$GIT_DIR/ORIG_HEAD"`
			`fi`
			`echo "$rev" > "$GIT_DIR/HEAD"`
			`}`
Trivial git script fixups Fix permissions, and add trivial "reset" and "add" scripts. The "reset" script just resets the index back to head, while the "add" script is just a crutch for people used to do "cvs add". 2005-06-15 03:56:05 +02:00			`git-update-cache --refresh`
Remove MERGE_HEAD in "git checkout/reset" Both of these scripts will end up resetting the index to some specific head, and any unresolved merge will be forgotten. 2005-06-22 00:40:00 +02:00			`rm -f "$GIT_DIR/MERGE_HEAD"`