Merge branch 'jk/maint-upload-archive' into maint

diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index 10223092a9ebfed4092db680529a42ca8886a9f2..41c88a98a2de1ce817351243f9aa9e2811604097 100644 (file)
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -43,6 +43,9 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
        struct transport *transport;
        const struct ref *ref;
 
+       if (argc == 2 && !strcmp("-h", argv[1]))
+               usage(ls_remote_usage);
+
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];