Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Lazily open pack index files on demand
[gitweb.git]
/
git-reset.sh
diff --git
a/git-reset.sh
b/git-reset.sh
index fee6d98d9cba708828c36a2d2a29dbec8662c36b..a172d7ce25b40f192b0036d29a8a60e62649159c 100755
(executable)
--- a/
git-reset.sh
+++ b/
git-reset.sh
@@
-71,7
+71,7
@@
then
die "Cannot do a soft reset in the middle of a merge."
fi
else
- git-read-tree --reset $update "$rev" || exit
+ git-read-tree -
v -
-reset $update "$rev" || exit
fi
# Any resets update HEAD to the head being switched to.