[PATCH 0/9] Handle pull option precedence · Elijah Newren via GitGitGadget <hidden> · 2021-07-17
[PATCH 2/9] t7601: add tests of interactions with multiple merge heads and config · Elijah Newren via GitGitGadget <hidden> · 2021-07-17
RE: [PATCH 2/9] t7601: add tests of interactions with multiple merge heads and config · Felipe Contreras <hidden> · 2021-07-17
[PATCH 1/9] t7601: add relative precedence tests for merge and rebase flags/options · Elijah Newren via GitGitGadget <hidden> · 2021-07-17
RE: [PATCH 1/9] t7601: add relative precedence tests for merge and rebase flags/options · Felipe Contreras <hidden> · 2021-07-17
[PATCH 3/9] pull: abort if --ff-only is given and fast-forwarding is impossible · Alex Henrie via GitGitGadget <hidden> · 2021-07-17
RE: [PATCH 3/9] pull: abort if --ff-only is given and fast-forwarding is impossible · Felipe Contreras <hidden> · 2021-07-17
[PATCH 4/9] pull: since --ff-only overrides, handle it first · Elijah Newren via GitGitGadget <hidden> · 2021-07-17
RE: [PATCH 4/9] pull: since --ff-only overrides, handle it first · Felipe Contreras <hidden> · 2021-07-17
[PATCH 5/9] pull: ensure --rebase overrides ability to ff · Elijah Newren via GitGitGadget <hidden> · 2021-07-17
RE: [PATCH 5/9] pull: ensure --rebase overrides ability to ff · Felipe Contreras <hidden> · 2021-07-17
[PATCH 6/9] pull: make --rebase and --no-rebase override pull.ff=only · Elijah Newren via GitGitGadget <hidden> · 2021-07-17
RE: [PATCH 6/9] pull: make --rebase and --no-rebase override pull.ff=only · Felipe Contreras <hidden> · 2021-07-17
[PATCH 8/9] pull: update docs & code for option compatibility with rebasing · Elijah Newren via GitGitGadget <hidden> · 2021-07-17
[PATCH 7/9] pull: abort by default when fast-forwarding is not possible · Elijah Newren via GitGitGadget <hidden> · 2021-07-17
RE: [PATCH 7/9] pull: abort by default when fast-forwarding is not possible · Felipe Contreras <hidden> · 2021-07-17
[PATCH 9/9] pull: fix handling of multiple heads · Elijah Newren via GitGitGadget <hidden> · 2021-07-17
RE: [PATCH 0/9] Handle pull option precedence · Felipe Contreras <hidden> · 2021-07-17
[PATCH v2 0/8] Handle pull option precedence · Elijah Newren via GitGitGadget <hidden> · 2021-07-21
[PATCH v2 3/8] pull: abort if --ff-only is given and fast-forwarding is impossible · Alex Henrie via GitGitGadget <hidden> · 2021-07-21
RE: [PATCH v2 3/8] pull: abort if --ff-only is given and fast-forwarding is impossible · Felipe Contreras <hidden> · 2021-07-21
[PATCH v2 1/8] t7601: test interaction of merge/rebase/fast-forward flags and options · Elijah Newren via GitGitGadget <hidden> · 2021-07-21
RE: [PATCH v2 1/8] t7601: test interaction of merge/rebase/fast-forward flags and options · Felipe Contreras <hidden> · 2021-07-21
[PATCH v2 2/8] t7601: add tests of interactions with multiple merge heads and config · Elijah Newren via GitGitGadget <hidden> · 2021-07-21
[PATCH v2 5/8] pull: make --rebase and --no-rebase override pull.ff=only · Elijah Newren via GitGitGadget <hidden> · 2021-07-21
RE: [PATCH v2 5/8] pull: make --rebase and --no-rebase override pull.ff=only · Felipe Contreras <hidden> · 2021-07-21
[PATCH v2 8/8] pull: fix handling of multiple heads · Elijah Newren via GitGitGadget <hidden> · 2021-07-21
[PATCH v2 7/8] pull: update docs & code for option compatibility with rebasing · Elijah Newren via GitGitGadget <hidden> · 2021-07-21
[PATCH v2 6/8] pull: abort by default when fast-forwarding is not possible · Elijah Newren via GitGitGadget <hidden> · 2021-07-21
RE: [PATCH v2 6/8] pull: abort by default when fast-forwarding is not possible · Felipe Contreras <hidden> · 2021-07-21
[PATCH v2 4/8] pull: since --ff-only overrides, handle it first · Elijah Newren via GitGitGadget <hidden> · 2021-07-21
Re: [PATCH v2 4/8] pull: since --ff-only overrides, handle it first · Matthias Baumgarten <hidden> · 2021-07-21
Re: [PATCH v2 4/8] pull: since --ff-only overrides, handle it first · Felipe Contreras <hidden> · 2021-07-21
RE: [PATCH v2 0/8] Handle pull option precedence · Felipe Contreras <hidden> · 2021-07-21
[PATCH v3 0/8] Handle pull option precedence · Elijah Newren via GitGitGadget <hidden> · 2021-07-22
[PATCH v3 1/8] t7601: test interaction of merge/rebase/fast-forward flags and options · Elijah Newren via GitGitGadget <hidden> · 2021-07-22
[PATCH v3 2/8] t7601: add tests of interactions with multiple merge heads and config · Elijah Newren via GitGitGadget <hidden> · 2021-07-22
[PATCH v3 3/8] pull: abort if --ff-only is given and fast-forwarding is impossible · Alex Henrie via GitGitGadget <hidden> · 2021-07-22
[PATCH v3 5/8] pull: make --rebase and --no-rebase override pull.ff=only · Elijah Newren via GitGitGadget <hidden> · 2021-07-22
[PATCH v3 4/8] pull: since --ff-only overrides, handle it first · Elijah Newren via GitGitGadget <hidden> · 2021-07-22
[PATCH v3 6/8] pull: abort by default when fast-forwarding is not possible · Elijah Newren via GitGitGadget <hidden> · 2021-07-22
[PATCH v3 8/8] pull: fix handling of multiple heads · Elijah Newren via GitGitGadget <hidden> · 2021-07-22
[PATCH v3 7/8] pull: update docs & code for option compatibility with rebasing · Elijah Newren via GitGitGadget <hidden> · 2021-07-22
RE: [PATCH v3 0/8] Handle pull option precedence · Felipe Contreras <hidden> · 2021-07-22

RE: [PATCH v2 6/8] pull: abort by default when fast-forwarding is not possible

From: Felipe Contreras <hidden>
Date: 2021-07-21 12:27:35

Elijah Newren via GitGitGadget wrote:

From: Elijah Newren <redacted>

We have for some time shown a long warning when the user does not
specify how to reconcile divergent branches with git pull.  Make it an
error now.

Yes, but the warning doesn't say anything about changing the defaults or
deprecation.

-- 
Felipe Contreras

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help