Merge lt/revlist,jc/diff,jc/revparse,jc/abbrev

diff --git a/git-add.sh b/git-add.sh
index 4bf41281d5554f9b1da103b0360eebc411a435eb..f719b4b1a81a386c9cf62efad811005471be0f8c 100755 (executable)
--- a/git-add.sh
+++ b/git-add.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+USAGE='[-n] [-v] <file>...'
+SUBDIRECTORY_OK='Yes'
+. git-sh-setup
+
 show_only=
 verbose=
 while : ; do
@@ -10,6 +14,9 @@ while : ; do
     -v)
        verbose=--verbose
        ;;
+    -*)
+       usage
+       ;;
     *)
        break
        ;;
@@ -17,8 +24,6 @@ while : ; do
   shift
 done
 
-GIT_DIR=$(git-rev-parse --git-dir) || exit
-
 if test -f "$GIT_DIR/info/exclude"
 then
        git-ls-files -z \