pull: trivial whitespace style fix
Two spaces unaligned to anything is not part of the coding-style. A single tab is. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
Jun 17, 2021 at 11:17 UTC
a7d18a11098b5f9cc8b1511ecaef5378c1030f97
1 file changed
+3
-3
builtin/pull.c
+3
-3
@@ -126,9 +126,9 @@ static struct option pull_options[] = {
126
/* Options passed to git-merge or git-rebase */
127
OPT_GROUP(N_("Options related to merging")),
128
OPT_CALLBACK_F('r', "rebase", &opt_rebase,
129
- "(false|true|merges|preserve|interactive)",
130
- N_("incorporate changes by rebasing rather than merging"),
131
- PARSE_OPT_OPTARG, parse_opt_rebase),
129
+ "(false|true|merges|preserve|interactive)",
130
+ N_("incorporate changes by rebasing rather than merging"),
131
+ PARSE_OPT_OPTARG, parse_opt_rebase),
132
OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,
133
N_("do not show a diffstat at the end of the merge"),
134
PARSE_OPT_NOARG | PARSE_OPT_NONEG),