diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-08 13:30:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-08 13:30:34 -0700 |
| commit | cfba19618f61d8dce247160d3e9516b041bb98cf (patch) | |
| tree | 0c54b05ff3da61aa938bb684dd1d27eded93a2a6 /builtin | |
| parent | f7ab8267401da4c124e571b7774f457ddeea17aa (diff) | |
| parent | c93ca46cf5d0b0cd22e357a6460fa84fd4633440 (diff) | |
| download | git-cfba19618f61d8dce247160d3e9516b041bb98cf.tar.xz | |
Merge branch 'sg/column-nl'
The parser for the "--nl" option of "git column" has been
corrected.
* sg/column-nl:
column: fix parsing of the '--nl' option
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/column.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/column.c b/builtin/column.c index 40d4b3bee2..158fdf53d9 100644 --- a/builtin/column.c +++ b/builtin/column.c @@ -29,7 +29,7 @@ int cmd_column(int argc, const char **argv, const char *prefix) OPT_INTEGER(0, "raw-mode", &colopts, N_("layout to use")), OPT_INTEGER(0, "width", &copts.width, N_("maximum width")), OPT_STRING(0, "indent", &copts.indent, N_("string"), N_("padding space on left border")), - OPT_INTEGER(0, "nl", &copts.nl, N_("padding space on right border")), + OPT_STRING(0, "nl", &copts.nl, N_("string"), N_("padding space on right border")), OPT_INTEGER(0, "padding", &copts.padding, N_("padding space between columns")), OPT_END() }; |