From: Felipe Contreras <felipe.contreras@gmail.com>
To: Alex Henrie <alexhenrie24@gmail.com>,
git@vger.kernel.org, gitster@pobox.com, newren@gmail.com,
phillip.wood123@gmail.com, avarab@gmail.com,
felipe.contreras@gmail.com
Cc: Alex Henrie <alexhenrie24@gmail.com>
Subject: RE: [PATCH v2] pull: abort if --ff-only is given and fast-forwarding is impossible
Date: Thu, 15 Jul 2021 04:55:29 -0500 [thread overview]
Message-ID: <60f00611796d0_2e672085d@natae.notmuch> (raw)
In-Reply-To: <20210715050559.3371470-1-alexhenrie24@gmail.com>
Alex Henrie wrote:
> 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.
>
> Per the discussion on the mailing list, explicitly passing --rebase on
> the command line countermands pull.ff=only in the configuration or a
> previous --ff-only on the command line.
>
> The --no-ff in `git pull --rebase --no-ff` is still ignored.
>
> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---
> This is the code I was working on when Elijah sent his patch set to
> accomplish the same general goals. Mine is a less ambitious (and less
> invasive) approach, but I don't care which solution wins.
This is a better approach than Elijah's because it doesn't fail if both
pull.ff and pull.rebase are configured.
But there's still the problem that the new behavior cannot be
configured.
--
Felipe Contreras
prev parent reply other threads:[~2021-07-15 9:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-15 5:05 [PATCH v2] pull: abort if --ff-only is given and fast-forwarding is impossible Alex Henrie
2021-07-15 9:55 ` Felipe Contreras [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=60f00611796d0_2e672085d@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=phillip.wood123@gmail.com \
/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.
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 NNTP newsgroup(s).