Merge in 1.6.5.4

diff --git a/fast-import.c b/fast-import.c
index b41d29fd31e47f3a73e61af4fc14ac16dd7ae218..dd3c99d60d0ccf2506b08632c35c5ffc2bbc3255 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -2485,6 +2485,9 @@ int main(int argc, const char **argv)
 
        git_extract_argv0_path(argv[0]);
 
+       if (argc == 2 && !strcmp(argv[1], "-h"))
+               usage(fast_import_usage);
+
        setup_git_directory();
        git_config(git_pack_config, NULL);
        if (!pack_compression_seen && core_compression_seen)