From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>,
Philip Oakley <philipoakley@iee.email>,
Alex Henrie <alexhenrie24@gmail.com>, Jeff King <peff@peff.net>,
Junio C Hamano <gitster@pobox.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 3/3] pull: trivial whitespace style fix
Date: Sat, 12 Jun 2021 23:59:49 -0500 [thread overview]
Message-ID: <20210613045949.255090-4-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210613045949.255090-1-felipe.contreras@gmail.com>
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>
---
builtin/pull.c | 6 +++---
1 file 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),
--
2.32.0
next prev parent reply other threads:[~2021-06-13 4:59 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-13 4:59 [PATCH 0/3] pull: obvious fixes Felipe Contreras
2021-06-13 4:59 ` [PATCH 1/3] pull: cleanup autostash check Felipe Contreras
2021-06-14 14:56 ` Elijah Newren
2021-06-15 10:59 ` Felipe Contreras
[not found] ` <CAPUEspg_MmerWb7h8MyhgcJXbWrJeeSyeJ7z2S6eHgDfRDPKvA@mail.gmail.com>
2021-06-15 11:09 ` Felipe Contreras
2021-06-13 4:59 ` [PATCH 2/3] pull: trivial cleanup Felipe Contreras
2021-06-14 14:57 ` Elijah Newren
2021-06-13 4:59 ` Felipe Contreras [this message]
2021-06-14 15:03 ` [PATCH 3/3] pull: trivial whitespace style fix Elijah Newren
2021-06-14 14:47 ` [PATCH 0/3] pull: obvious fixes Elijah Newren
2021-06-15 1:25 ` Junio C Hamano
2021-06-15 10:41 ` Felipe Contreras
2021-06-17 16:17 ` [PATCH v2 " Felipe Contreras
2021-06-17 16:17 ` [PATCH v2 1/3] pull: cleanup autostash check Felipe Contreras
2021-06-17 16:17 ` [PATCH v2 2/3] pull: trivial cleanup Felipe Contreras
2021-06-17 16:17 ` [PATCH v2 3/3] pull: trivial whitespace style fix Felipe Contreras
2021-06-17 16:48 ` [PATCH v2 0/3] pull: obvious fixes Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210613045949.255090-4-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.email \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.