Merge branch 'sp/smart-http-failure-to-push'

diff --git a/builtin/stripspace.c b/builtin/stripspace.c
index 1288ffcc52530f8ef9561acd2eb2ec5322c9e230..f16986c0ae811f6b998d20be39da1af6095fcfe8 100644 (file)
--- a/builtin/stripspace.c
+++ b/builtin/stripspace.c
@@ -75,7 +75,7 @@ int cmd_stripspace(int argc, const char **argv, const char *prefix)
                                !strcmp(argv[1], "--strip-comments")))
                strip_comments = 1;
        else if (argc > 1)
-               usage("git stripspace [-s | --strip-comments] < <stream>");
+               usage("git stripspace [-s | --strip-comments] < input");
 
        if (strbuf_read(&buf, 0, 1024) < 0)
                die_errno("could not read the input");