Merge branch 'maint-1.6.1' into maint

diff --git a/patch-id.c b/patch-id.c
index 3660ad461d359a7fb968692f40cea75c9764f61a..0df4cb086ba26d1f4d56b8347a6a7bcf219832f5 100644 (file)
--- a/patch-id.c
+++ b/patch-id.c
@@ -73,7 +73,7 @@ static void generate_id_list(void)
        flush_current_id(patchlen, sha1, &ctx);
 }
 
-static const char patch_id_usage[] = "git-patch-id < patch";
+static const char patch_id_usage[] = "git patch-id < patch";
 
 int main(int argc, char **argv)
 {