Merge branch 'nd/worktree-add-B'

diff --git a/builtin/column.c b/builtin/column.c
index 75818520e1b74de607620e48d2d3afb131c6e896..33314b4d7127cb6e4116c350e113058e07f58474 100644 (file)
--- a/builtin/column.c
+++ b/builtin/column.c
@@ -6,7 +6,7 @@
 #include "column.h"
 
 static const char * const builtin_column_usage[] = {
-       N_("git column [options]"),
+       N_("git column [<options>]"),
        NULL
 };
 static unsigned int colopts;
@@ -51,7 +51,7 @@ int cmd_column(int argc, const char **argv, const char *prefix)
                        die(_("--command must be the first argument"));
        }
        finalize_colopts(&colopts, -1);
-       while (!strbuf_getline(&sb, stdin, '\n'))
+       while (!strbuf_getline(&sb, stdin))
                string_list_append(&list, sb.buf);
 
        print_columns(&list, colopts, &copts);