Users need to specify if they want to either --merge or --rebase, but
unfortunately the former is missing.
In many discussions regarding `git pull` --merge is often mentioned, but
for one reason or another the patches have not been merged.
Let's just go ahead and do it.
Now we can update the default warning to say --merge instead of the
non-intuitive --no-rebase.
Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---
Since v1 I've removed any hint of deprecation (even though we obviously
want to do that), and added an actual test (I don't seem to find a
simialr one for --no-rebase).
Range-diff against v1:
1: 80d7866599 < -: ---------- pull: introduce --merge option
-: ---------- > 1: 5969fc4455 pull: introduce --merge option
Documentation/git-pull.txt | 6 ++++++
builtin/pull.c | 4 +++-
t/t5520-pull.sh | 7 +++++++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 5c3fb67c01..c7a1f676cc 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -134,6 +134,12 @@ unless you have read linkgit:git-rebase[1] carefully.
--no-rebase::
Override earlier --rebase.
+-m::
+--merge::
+ Do a merge.
++
+Alias for --no-rebase.
+
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/t5520-pull.sh b/t/t5520-pull.sh
index e2c0c51022..f299a82405 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -452,6 +452,13 @@ test_expect_success 'pull.rebase' '
test_cmp expect actual
'
+test_expect_success 'pull.rebase with --merge' '
+ git reset --hard before-rebase &&
+ test_config pull.rebase true &&
+ git pull --merge . copy &&
+ test_cmp_rev HEAD^2 copy
+'
+
test_expect_success 'pull --autostash & pull.rebase=true' '
test_config pull.rebase true &&
test_pull_autostash 1 --autostash
--
2.32.0.40.gb9b36f9b52
