sequencer: rename reset_for_rollback to reset_merge

diff --git a/builtin/column.c b/builtin/column.c
index 5228ccf37a5c8f568091ebef6df86fda40aa93dc..e815e148aa18364c198eef0ee5c2ed4e34ae77e9 100644 (file)
--- a/builtin/column.c
+++ b/builtin/column.c
@@ -43,7 +43,7 @@ int cmd_column(int argc, const char **argv, const char *prefix)
 
        memset(&copts, 0, sizeof(copts));
        copts.padding = 1;
-       argc = parse_options(argc, argv, "", options, builtin_column_usage, 0);
+       argc = parse_options(argc, argv, prefix, options, builtin_column_usage, 0);
        if (argc)
                usage_with_options(builtin_column_usage, options);
        if (real_command || command) {