From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Alex Henrie <alexhenrie24@gmail.com>,
Richard Hansen <rhansen@rhansen.org>,
Junio C Hamano <gitster@pobox.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [RFC PATCH 32/35] pull: improve default warning
Date: Mon, 5 Jul 2021 07:32:06 -0500 [thread overview]
Message-ID: <20210705123209.1808663-33-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210705123209.1808663-1-felipe.contreras@gmail.com>
We don't want to start by recommending a permanent configuration, but a
temporary solution so they start training their fingers and maybe learn
how to do a rebase. So we start with the commands.
Also, we need to be clear about what we mean by "specifying"; merge, or
rebase.
Moreover, it's better use --global in the configuration commands like we
did with push.default.
And finally, point to the documentation that explains what is a
non-fast-forward, and how to solve it:
git help fast-forward
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
builtin/pull.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index e304b22bd8..27ce2f2183 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -979,18 +979,19 @@ static int get_can_ff(struct object_id *orig_head, struct object_id *orig_merge_
static void show_advice_pull_non_ff(void)
{
- advise(_("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"
+ advise(_("Pulling without specifying how to reconcile divergent branches is discouraged;\n"
+ "you need to specify if you want a merge, or a rebase.\n"
"\n"
- " git config pull.mode merge # the default strategy\n"
- " git config pull.mode rebase\n"
- " git config pull.mode fast-forward\n"
+ " git pull --merge # the default\n"
+ " git pull --rebase\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, --merge,\n"
- "or --ff-only on the command line to override the configured default per\n"
- "invocation.\n"));
+ "You can quell this message by running one of the following commands:\n"
+ "\n"
+ " git config --global pull.mode merge\n"
+ " git config --global pull.mode rebase\n"
+ " git config --global pull.mode fast-forward\n"
+ "\n"
+ "For more information check \"git help fast-forward\"."));
}
int cmd_pull(int argc, const char **argv, const char *prefix)
--
2.32.0.36.g70aac2b1aa
next prev parent reply other threads:[~2021-07-05 12:33 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-05 12:31 [RFC PATCH 00/35] git update: fix broken git pull Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 01/35] merge: improve fatal fast-forward message Felipe Contreras
2021-07-06 20:07 ` Ævar Arnfjörð Bjarmason
2021-07-06 20:39 ` Felipe Contreras
2021-07-06 20:48 ` Randall S. Becker
2021-07-06 20:56 ` Junio C Hamano
2021-07-06 21:15 ` Felipe Contreras
2021-07-06 21:31 ` Randall S. Becker
2021-07-06 21:54 ` Junio C Hamano
2021-07-06 22:26 ` Randall S. Becker
2021-07-06 21:11 ` Felipe Contreras
2021-07-06 21:27 ` Randall S. Becker
2021-07-06 22:14 ` Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 02/35] merge: split cmd_merge() Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 03/35] fast-forward: add new builtin Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 04/35] doc: fast-forward: explain what it is Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 05/35] fast-forward: add advice for novices Felipe Contreras
2021-07-06 20:09 ` Ævar Arnfjörð Bjarmason
2021-07-06 20:42 ` Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 06/35] fast-forward: make the advise configurable Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 07/35] fast-forward: add help about merge vs. rebase Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 08/35] update: new built-in Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 09/35] update: add options and usage skeleton Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 10/35] update: add --ff option Felipe Contreras
2021-07-06 20:12 ` Ævar Arnfjörð Bjarmason
2021-07-06 20:46 ` Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 11/35] update: add --merge mode Felipe Contreras
2021-07-06 20:13 ` Ævar Arnfjörð Bjarmason
2021-07-06 20:51 ` Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 12/35] commit: support for multiple MERGE_MODE Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 13/35] merge: add --reverse-parents option Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 14/35] update: reverse the order of parents Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 15/35] update: fake a reverse order of parents in message Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 16/35] update: add --rebase mode Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 17/35] update: add mode configuation Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 18/35] update: add per-branch mode configuration Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 19/35] pull: cleanup autostash check Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 20/35] pull: trivial cleanup Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 21/35] pull: trivial whitespace style fix Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 22/35] pull: introduce --merge option Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 23/35] rebase: add REBASE_DEFAULT Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 24/35] pull: move configuration fetches Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 25/35] pull: show warning with --ff options Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 26/35] pull: add pull.mode Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 27/35] pull: add per-branch mode configuration Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 28/35] pull: add pull.mode=fast-forward Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 29/35] pull: reorganize mode conditionals Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 30/35] pull: add diverging advice on fast-forward mode Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 31/35] pull: improve --rebase and pull.rebase interaction Felipe Contreras
2021-07-05 12:32 ` Felipe Contreras [this message]
2021-07-05 12:32 ` [RFC PATCH 33/35] pull: advice of future changes Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 34/35] FUTURE: pull: enable ff-only mode by default Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 35/35] !fixup " 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210705123209.1808663-33-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rhansen@rhansen.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).