Merge branch 'master' into js/c-merge-recursive

diff --git a/builtin-prune.c b/builtin-prune.c
index 6a86eb52aedc45b0a59adad4da31341440f2f82e..89ec7f1426d3f5d02486e3148b0c568edbe15300 100644 (file)
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -10,7 +10,7 @@
 #include "builtin.h"
 #include "cache-tree.h"
 
-static const char prune_usage[] = "git prune [-n]";
+static const char prune_usage[] = "git-prune [-n]";
 static int show_only = 0;
 static struct rev_info revs;