Merge branches 'jc/branch' and 'jc/rebase'

diff --git a/git-reset.sh b/git-reset.sh
index f9995cadf563a7b3b2c1dcdeea3bf862feac2e4b..2086d26d343c59d36df79d874d65f58d6d7d8b10 100755 (executable)
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
 . git-sh-setup || die "Not a git archive"
 
+usage () {
+       die 'Usage: git reset [--mixed | --soft | --hard]  [<commit-ish>]'
+}
+
 tmp=/var/tmp/reset.$$
 trap 'rm -f $tmp-*' 0 1 2 3 15
 
@@ -10,6 +14,8 @@ case "$1" in
        reset_type="$1"
        shift
        ;;
+-*)
+        usage ;;
 esac
 
 rev=$(git-rev-parse --verify --default HEAD "$@") || exit