Merge branch 'jc/1.7.0-diff-whitespace-only-status'

diff --git a/index-pack.c b/index-pack.c
index b4f82786592e2e34392191e823d645e17d955fcf..190f372dd81f85d76068b166cc1688487640fdba 100644 (file)
--- a/index-pack.c
+++ b/index-pack.c
@@ -882,6 +882,9 @@ int main(int argc, char **argv)
 
        git_extract_argv0_path(argv[0]);
 
+       if (argc == 2 && !strcmp(argv[1], "-h"))
+               usage(index_pack_usage);
+
        /*
         * We wish to read the repository's config file if any, and
         * for that it is necessary to call setup_git_directory_gently().