projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tutorial: adjust merge example to recursive strategy.
[git.git]
/
git-reset.sh
diff --git
a/git-reset.sh
b/git-reset.sh
index
f9995ca
..
72ef303
100755
(executable)
--- a/
git-reset.sh
+++ b/
git-reset.sh
@@
-1,5
+1,9
@@
#!/bin/sh
#!/bin/sh
-. git-sh-setup || die "Not a git archive"
+. git-sh-setup
+
+usage () {
+ die 'Usage: git reset [--mixed | --soft | --hard] [<commit-ish>]'
+}
tmp=/var/tmp/reset.$$
trap 'rm -f $tmp-*' 0 1 2 3 15
tmp=/var/tmp/reset.$$
trap 'rm -f $tmp-*' 0 1 2 3 15
@@
-10,6
+14,8
@@
case "$1" in
reset_type="$1"
shift
;;
reset_type="$1"
shift
;;
+-*)
+ usage ;;
esac
rev=$(git-rev-parse --verify --default HEAD "$@") || exit
esac
rev=$(git-rev-parse --verify --default HEAD "$@") || exit