Merge branch 'js/rebase' into HEAD

[git.git] / builtin-reset.c

diff --git a/builtin-reset.c b/builtin-reset.c
index 99d5c082a629c870e268160635c8e900155f164a..e1dc31e0eb80ddc2d1b82f12eda31401b9f40ebc 100644 (file)
--- a/builtin-reset.c
+++ b/builtin-reset.c
@@ -169,7 +169,7 @@ static void prepend_reflog_action(const char *action, char *buf, size_t size)
 }
 
 enum reset_type { MIXED, SOFT, HARD, NONE };
-static char *reset_type_names[] = { "mixed", "soft", "hard", NULL };
+static const char *reset_type_names[] = { "mixed", "soft", "hard", NULL };
 
 int cmd_reset(int argc, const char **argv, const char *prefix)
 {