projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master changes into rc.
[git.git]
/
git-reset-script
diff --git
a/git-reset-script
b/git-reset-script
index
49994df
..
7da8d86
100755
(executable)
--- a/
git-reset-script
+++ b/
git-reset-script
@@
-1,7
+1,7
@@
#!/bin/sh
. git-sh-setup-script || die "Not a git archive"
#!/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
+rev=$(git-rev-parse --verify --default HEAD "$@") || exit
+rev=$(git-rev-parse --verify $rev^0) || exit
git-read-tree --reset "$rev" && {
if orig=$(git-rev-parse --verify HEAD 2>/dev/null)
then
git-read-tree --reset "$rev" && {
if orig=$(git-rev-parse --verify HEAD 2>/dev/null)
then