git-status: use ls-files --others --directory for untracked list.

[thirdparty/git.git] / git-reset.sh

diff --git a/git-reset.sh b/git-reset.sh
index 2086d26d343c59d36df79d874d65f58d6d7d8b10..6c9e58ad9a727ab5091b0de02e089b82cb8331dd 100755 (executable)
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -1,11 +1,9 @@
 #!/bin/sh
-. git-sh-setup || die "Not a git archive"
 
-usage () {
-       die 'Usage: git reset [--mixed | --soft | --hard]  [<commit-ish>]'
-}
+USAGE='[--mixed | --soft | --hard]  [<commit-ish>]'
+. git-sh-setup
 
-tmp=/var/tmp/reset.$$
+tmp=${GIT_DIR}/reset.$$
 trap 'rm -f $tmp-*' 0 1 2 3 15
 
 reset_type=--mixed