diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2021-06-17 19:17:10 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-06-19 10:36:17 +0300 |
| commit | a7d18a11098b5f9cc8b1511ecaef5378c1030f97 (patch) | |
| tree | 3ad95127d2e098c0c7232ecee29bc39e28bd60f0 /builtin | |
| parent | a751e0296f6771e4dec6258d8c3f9bf658da30de (diff) | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pull.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 80e2f55cbc..3e13f81084 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -126,9 +126,9 @@ static struct option pull_options[] = { /* Options passed to git-merge or git-rebase */ OPT_GROUP(N_("Options related to merging")), OPT_CALLBACK_F('r', "rebase", &opt_rebase, - "(false|true|merges|preserve|interactive)", - N_("incorporate changes by rebasing rather than merging"), - PARSE_OPT_OPTARG, parse_opt_rebase), + "(false|true|merges|preserve|interactive)", + N_("incorporate changes by rebasing rather than merging"), + PARSE_OPT_OPTARG, parse_opt_rebase), OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL, N_("do not show a diffstat at the end of the merge"), PARSE_OPT_NOARG | PARSE_OPT_NONEG), |