Merge branch 'maint'

* maint:
git submodule: fix usage line
doc/git-pack-refs: fix two grammar issues
commit: abort commit if interactive add failed
git-repack: use non-dashed update-server-info

diff --combined git-repack.sh
index 1782a23b26106545dde94a63a42340b3427cb04b,00c597e97c8fd5a97105d2c68315cef414175669..0868734723b3c96144bfa9360a9e19ebae1995f7
--- 1/git-repack.sh
--- 2/git-repack.sh
+++ b/git-repack.sh
@@@ -60,7 -60,6 +60,7 @@@ case ",$all_into_one," i
        args='--unpacked --incremental'
        ;;
  ,t,)
 +      args= existing=
        if [ -d "$PACKDIR" ]; then
                for e in `cd "$PACKDIR" && find . -type f -name '*.pack' \
                        | sed -e 's/^\.\///' -e 's/\.pack$//'`
@@@ -68,10 -67,11 +68,10 @@@
                        if [ -e "$PACKDIR/$e.keep" ]; then
                                : keep
                        else
 -                              args="$args --unpacked=$e.pack"
                                existing="$existing $e"
                        fi
                done
 -              if test -n "$args" -a -n "$unpack_unreachable" -a \
 +              if test -n "$existing" -a -n "$unpack_unreachable" -a \
                        -n "$remove_redundant"
                then
                        args="$args $unpack_unreachable"
@@@ -181,5 -181,5 +181,5 @@@ f
  
  case "$no_update_info" in
  t) : ;;
- *) git-update-server-info ;;
+ *) git update-server-info ;;
  esac