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 22/35] pull: introduce --merge option
Date: Mon, 5 Jul 2021 07:31:56 -0500 [thread overview]
Message-ID: <20210705123209.1808663-23-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210705123209.1808663-1-felipe.contreras@gmail.com>
Previously --no-rebase (which still works for backwards compatibility).
Now we can update the default warning, and the git-pull(1) man page to
use --merge instead of the non-intuitive --no-rebase.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
Documentation/git-pull.txt | 7 +++++--
builtin/pull.c | 4 +++-
t/t7601-merge-pull-config.sh | 8 ++++----
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 5c3fb67c01..d23128fa72 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -131,8 +131,11 @@ It rewrites history, which does not bode well when you
published that history already. Do *not* use this option
unless you have read linkgit:git-rebase[1] carefully.
---no-rebase::
- Override earlier --rebase.
+-m::
+--merge::
+ Force a merge.
++
+Previously this was --no-rebase, but that usage has been deprecated.
Options related to fetching
~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/builtin/pull.c b/builtin/pull.c
index 3e13f81084..0d76b54186 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -129,6 +129,8 @@ static struct option pull_options[] = {
"(false|true|merges|preserve|interactive)",
N_("incorporate changes by rebasing rather than merging"),
PARSE_OPT_OPTARG, parse_opt_rebase),
+ OPT_SET_INT('m', "merge", &opt_rebase,
+ N_("incorporate changes by merging"), REBASE_FALSE),
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),
@@ -936,7 +938,7 @@ static void show_advice_pull_non_ff(void)
" git config pull.ff only # fast-forward only\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"
+ "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"));
}
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index 52e8ccc933..6d03e0b9fe 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -60,9 +60,9 @@ test_expect_success 'pull.rebase not set and --rebase given' '
test_i18ngrep ! "Pulling without specifying how to reconcile" err
'
-test_expect_success 'pull.rebase not set and --no-rebase given' '
+test_expect_success 'pull.rebase not set and --merge given' '
git reset --hard c0 &&
- git pull --no-rebase . c1 2>err &&
+ git pull --merge . c1 2>err &&
test_i18ngrep ! "Pulling without specifying how to reconcile" err
'
@@ -119,9 +119,9 @@ test_expect_success 'pull.rebase not set and --rebase given (not-fast-forward)'
test_i18ngrep ! "Pulling without specifying how to reconcile" err
'
-test_expect_success 'pull.rebase not set and --no-rebase given (not-fast-forward)' '
+test_expect_success 'pull.rebase not set and --merge given (not-fast-forward)' '
git reset --hard c2 &&
- git pull --no-rebase . c1 2>err &&
+ git pull --merge . c1 2>err &&
test_i18ngrep ! "Pulling without specifying how to reconcile" err
'
--
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 ` Felipe Contreras [this message]
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 ` [RFC PATCH 32/35] pull: improve default warning Felipe Contreras
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-23-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).