From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Vít Ondruch" <vondruch@redhat.com>,
"Alex Henrie" <alexhenrie24@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Philip Oakley" <philipoakley@iee.email>,
"Theodore Y . Ts'o" <tytso@mit.edu>,
"Jacob Keller" <jacob.keller@gmail.com>,
"Elijah Newren" <newren@gmail.com>,
"John Keeping" <john@keeping.me.uk>,
"Richard Hansen" <rhansen@rhansen.org>,
"Brian M. Carlson" <sandals@crustytoothpaste.net>,
"W. Trevor King" <wking@tremily.us>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH v2 08/14] pull: trivial whitespace style fix
Date: Fri, 4 Dec 2020 00:16:17 -0600 [thread overview]
Message-ID: <20201204061623.1170745-9-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20201204061623.1170745-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 f0b1c6bfea..b200f7544c 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -128,9 +128,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.29.2
next prev parent reply other threads:[~2020-12-04 6:17 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-04 6:16 [PATCH v2 00/14] pull: default warning improvements Felipe Contreras
2020-12-04 6:16 ` [PATCH v2 01/14] doc: pull: explain what is a fast-forward Felipe Contreras
2020-12-04 22:55 ` Elijah Newren
2020-12-05 1:21 ` Jacob Keller
2020-12-04 6:16 ` [PATCH v2 02/14] pull: improve default warning Felipe Contreras
2020-12-04 22:59 ` Elijah Newren
2020-12-05 0:12 ` Felipe Contreras
2020-12-05 0:56 ` Elijah Newren
2020-12-05 1:56 ` Felipe Contreras
2020-12-05 9:23 ` Chris Torek
2020-12-05 11:47 ` Felipe Contreras
2020-12-05 16:28 ` Elijah Newren
2020-12-05 21:27 ` Felipe Contreras
2020-12-06 1:01 ` Elijah Newren
2020-12-06 14:31 ` Felipe Contreras
2020-12-07 7:26 ` Junio C Hamano
2020-12-07 9:16 ` Felipe Contreras
2020-12-07 18:16 ` Junio C Hamano
2020-12-07 19:09 ` Felipe Contreras
2020-12-07 19:53 ` Junio C Hamano
2020-12-07 22:14 ` Felipe Contreras
2020-12-07 23:30 ` Jacob Keller
2020-12-08 2:23 ` Junio C Hamano
2020-12-08 3:15 ` Felipe Contreras
2020-12-08 20:16 ` Junio C Hamano
2020-12-09 9:52 ` Felipe Contreras
2020-12-09 19:05 ` Elijah Newren
2020-12-10 2:39 ` Felipe Contreras
2020-12-10 6:45 ` Junio C Hamano
2020-12-10 9:08 ` Felipe Contreras
2020-12-10 10:01 ` Felipe Contreras
2020-12-11 7:17 ` Junio C Hamano
2020-12-11 11:33 ` Felipe Contreras
2020-12-14 21:04 ` Junio C Hamano
2020-12-14 22:30 ` Felipe Contreras
2020-12-14 23:14 ` Junio C Hamano
2020-12-15 2:36 ` Felipe Contreras
2020-12-15 2:31 ` Jeff King
2020-12-15 3:49 ` Felipe Contreras
2020-12-15 11:18 ` Junio C Hamano
2020-12-15 12:53 ` Felipe Contreras
2020-12-07 9:23 ` Felipe Contreras
2020-12-04 6:16 ` [PATCH v2 03/14] pull: refactor fast-forward check Felipe Contreras
2020-12-04 6:16 ` [PATCH v2 04/14] pull: cleanup autostash check Felipe Contreras
2020-12-04 23:07 ` Elijah Newren
2020-12-05 0:47 ` Felipe Contreras
2020-12-05 0:57 ` Elijah Newren
2020-12-04 6:16 ` [PATCH v2 05/14] pull: trivial cleanup Felipe Contreras
2020-12-04 23:09 ` Elijah Newren
2020-12-05 0:48 ` Felipe Contreras
2020-12-04 6:16 ` [PATCH v2 06/14] pull: move default warning Felipe Contreras
2020-12-04 23:18 ` Elijah Newren
2020-12-04 23:36 ` Felipe Contreras
2020-12-04 6:16 ` [PATCH v2 07/14] pull: display default warning only when non-ff Felipe Contreras
2020-12-04 23:24 ` Elijah Newren
2020-12-05 1:03 ` Felipe Contreras
2020-12-04 6:16 ` Felipe Contreras [this message]
2020-12-04 6:16 ` [PATCH v2 09/14] pull: introduce --merge option Felipe Contreras
2020-12-04 23:27 ` Elijah Newren
2020-12-05 1:06 ` Felipe Contreras
2020-12-04 6:16 ` [PATCH v2 10/14] pull: add proper error with --ff-only Felipe Contreras
2020-12-04 23:34 ` Elijah Newren
2020-12-05 1:18 ` Felipe Contreras
2020-12-04 6:16 ` [PATCH v2 11/14] tentative: pull: change the semantics of --ff-only Felipe Contreras
2020-12-04 23:39 ` Elijah Newren
2020-12-05 4:01 ` Felipe Contreras
2020-12-05 4:06 ` [PATCH] experiment: pull: change --ff-only and default mode Felipe Contreras
2020-12-05 17:29 ` Elijah Newren
2020-12-05 18:16 ` Felipe Contreras
2020-12-07 7:34 ` Junio C Hamano
2020-12-05 11:37 ` [PATCH v2 11/14] tentative: pull: change the semantics of --ff-only Felipe Contreras
2020-12-04 6:16 ` [PATCH v2 12/14] pull: show warning with --ff Felipe Contreras
2020-12-04 23:41 ` Elijah Newren
2020-12-05 1:25 ` Felipe Contreras
2020-12-04 6:16 ` [PATCH v2 13/14] test: merge-pull-config: trivial cleanup Felipe Contreras
2020-12-04 23:41 ` Elijah Newren
2020-12-04 6:16 ` [PATCH v2 14/14] test: pull-options: revert unnecessary changes Felipe Contreras
2020-12-04 23:49 ` Elijah Newren
2020-12-05 1:28 ` Felipe Contreras
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=20201204061623.1170745-9-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=john@keeping.me.uk \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.email \
--cc=rhansen@rhansen.org \
--cc=sandals@crustytoothpaste.net \
--cc=tytso@mit.edu \
--cc=vondruch@redhat.com \
--cc=wking@tremily.us \
/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.