From: Alex Henrie <alexhenrie24@gmail.com>
To: git@vger.kernel.org, felipe.contreras@gmail.com,
gitster@pobox.com, ray@ameretat.dev, peff@peff.net,
vondruch@redhat.com, tytso@mit.edu
Cc: Alex Henrie <alexhenrie24@gmail.com>
Subject: [RFC 1/2] pull: warn that pulling will not merge by default in Git 3.0
Date: Tue, 24 Nov 2020 19:09:30 -0700 [thread overview]
Message-ID: <20201125020931.248427-1-alexhenrie24@gmail.com> (raw)
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
builtin/pull.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 17aa63cd35..4d80efe5b7 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -345,13 +345,14 @@ static enum rebase_type config_get_rebase(void)
return parse_config_rebase("pull.rebase", value, 1);
if (opt_verbosity >= 0 && !opt_ff) {
- warning(_("Pulling without specifying how to reconcile divergent branches is\n"
- "discouraged. You can squelch this message by running one of the following\n"
- "commands sometime before your next pull:\n"
+ warning(_("Starting in Git 3.0, the default behavior of `git pull` will change\n"
+ "when it is not specified how to reconcile divergent branches. You can\n"
+ "squelch this message by running one of the following commands sometime\n"
+ "before your next pull:\n"
"\n"
- " git config pull.rebase false # merge (the default strategy)\n"
+ " git config pull.rebase false # merge (the current default)\n"
" git config pull.rebase true # rebase\n"
- " git config pull.ff only # fast-forward only\n"
+ " git config pull.ff only # fast-forward only (the future default)\n"
"\n"
"You can replace \"git config\" with \"git config --global\" to set a default\n"
"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
--
2.29.2
next reply other threads:[~2020-11-25 2:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-25 2:09 Alex Henrie [this message]
2020-11-25 2:09 ` [RFC 2/2] pull: default pull.ff to "only" when pull.rebase is not set either Alex Henrie
2020-11-25 3:45 ` Felipe Contreras
2020-11-25 3:47 ` Felipe Contreras
2020-11-25 13:25 ` Philip Oakley
2020-12-02 4:43 ` Felipe Contreras
2020-12-03 2:21 ` Junio C Hamano
2020-12-03 9:07 ` Felipe Contreras
2020-12-03 18:06 ` Junio C Hamano
2020-12-03 19:29 ` Junio C Hamano
2020-12-03 23:05 ` Felipe Contreras
2020-12-04 0:53 ` Jacob Keller
2020-12-04 2:06 ` Junio C Hamano
2020-12-04 6:37 ` Felipe Contreras
2020-12-04 19:37 ` Junio C Hamano
2020-12-04 21:11 ` Felipe Contreras
2020-12-11 20:38 ` Alex Henrie
2020-12-12 1:08 ` 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=20201125020931.248427-1-alexhenrie24@gmail.com \
--to=alexhenrie24@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=ray@ameretat.dev \
--cc=tytso@mit.edu \
--cc=vondruch@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).