Merge branch 'maint-1.6.1' into maint

diff --git a/unpack-file.c b/unpack-file.c
index 6dd8ad02fbb05ca9124473d29132d31f0e14ede0..75cd2f1a6adf3ea773a6acc3f1e7f122e30676e5 100644 (file)
--- a/unpack-file.c
+++ b/unpack-file.c
@@ -29,7 +29,7 @@ int main(int argc, char **argv)
        git_extract_argv0_path(argv[0]);
 
        if (argc != 2)
-               usage("git-unpack-file <sha1>");
+               usage("git unpack-file <sha1>");
        if (get_sha1(argv[1], sha1))
                die("Not a valid object name %s", argv[1]);