RE: [PATCH v2 3/8] pull: abort if --ff-only is given and fast-forwarding is impossible

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: RE: [PATCH v2 3/8] pull: abort if --ff-only is given and fast-forwarding is impossible
From: Felipe Contreras <felipe.contreras@xxxxxxxxx>
Date: Wed, 21 Jul 2021 07:25:47 -0500
Cc: Alex Henrie <alexhenrie24@xxxxxxxxx>, Son Luong Ngoc <sluongng@xxxxxxxxx>, Matthias Baumgarten <matthias.baumgarten@xxxxxxxxxx>, Eric Sunshine <sunshine@xxxxxxxxxxxxxx>, Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>, Elijah Newren <newren@xxxxxxxxx>, Elijah Newren <newren@xxxxxxxxx>, Alex Henrie <alexhenrie24@xxxxxxxxx>
In-reply-to: <c45cd2396664e915a1d962e6d131505df51b118e.1626831744.git.gitgitgadget@gmail.com>
References: <pull.1049.git.git.1626536507.gitgitgadget@gmail.com> <pull.1049.v2.git.git.1626831744.gitgitgadget@gmail.com> <c45cd2396664e915a1d962e6d131505df51b118e.1626831744.git.gitgitgadget@gmail.com>

Alex Henrie via GitGitGadget wrote:
> From: Alex Henrie <alexhenrie24@xxxxxxxxx>
> 
> The warning about pulling without specifying how to reconcile divergent
> branches says that after setting pull.rebase to true, --ff-only can
> still be passed on the command line to require a fast-forward. Make that
> actually work.

This is a backwards-incompatible change.

-- 
Felipe Contreras

References:
- [PATCH 0/9] Handle pull option precedence
  - From: Elijah Newren via GitGitGadget
- [PATCH v2 0/8] Handle pull option precedence
  - From: Elijah Newren via GitGitGadget
- [PATCH v2 3/8] pull: abort if --ff-only is given and fast-forwarding is impossible
  - From: Alex Henrie via GitGitGadget

Prev by Date: RE: [PATCH v2 1/8] t7601: test interaction of merge/rebase/fast-forward flags and options
Next by Date: RE: [PATCH v2 5/8] pull: make --rebase and --no-rebase override pull.ff=only
Previous by thread: [PATCH v2 3/8] pull: abort if --ff-only is given and fast-forwarding is impossible
Next by thread: [PATCH v2 1/8] t7601: test interaction of merge/rebase/fast-forward flags and options
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel Development] [Gcc Help] [IETF Annouce] [DCCP] [Netdev] [Networking] [Security] [V4L] [Bugtraq] [Yosemite] [MIPS Linux] [ARM Linux] [Linux Security] [Linux RAID] [Linux SCSI] [Fedora Users]