Skip to content

Commit a7d18a1

Browse files
felipecgitster
authored andcommitted
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>
1 parent a751e02 commit a7d18a1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

builtin/pull.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ static struct option pull_options[] = {
126126
/* Options passed to git-merge or git-rebase */
127127
OPT_GROUP(N_("Options related to merging")),
128128
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),
132132
OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,
133133
N_("do not show a diffstat at the end of the merge"),
134134
PARSE_OPT_NOARG | PARSE_OPT_NONEG),

0 commit comments

Comments
 (0)