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 --cc git-repack.sh
Simple merge