From: "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com>
To: "Artur Bieniek" <abieniek@antmicro.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Phillip Wood" <phillip.wood123@gmail.com>
Cc: "Koji Nakamaru" <gitgitgadget@gmail.com>,
git@vger.kernel.org, "Artur Bieniek" <ar2rekb@gmail.com>
Subject: Re: [PATCH] pull: add --hard mode
Date: Thu, 20 Aug 2026 19:29:08 +0200 [thread overview]
Message-ID: <fa62cf90-61ae-4352-b823-455ccffe403a@app.fastmail.com> (raw)
In-Reply-To: <2b9cc581-7c8e-4cb3-9524-2b466209ac7e@antmicro.com>
On Thu, Aug 20, 2026, at 18:43, Artur Bieniek wrote:
> One case where --ff-only does not seem to cover that audience is when
> the upstream branch itself is rewritten.
>
> For example, a checkout may contain no local development at all and only
> be used to track the latest state of an upstream branch, but if that
> branch is rebased or otherwise force-updated, git pull --ff-only will
> refuse to update it because the histories have diverged.
I don’t understand what you need a branch for in that case. I just use
the remote-tracking branch in that case (`origin/main` e.g.).
PS: Bottom posting is strongly preferred on this list.
> ...
prev parent reply other threads:[~2026-08-20 17:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-18 11:34 [PATCH] pull: add --hard mode Artur Bieniek via GitGitGadget
2026-08-18 14:48 ` Junio C Hamano
2026-08-20 9:58 ` Phillip Wood
2026-08-20 15:59 ` Junio C Hamano
2026-08-20 16:43 ` Artur Bieniek
2026-08-20 17:29 ` Kristoffer Haugsbakk [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=fa62cf90-61ae-4352-b823-455ccffe403a@app.fastmail.com \
--to=kristofferhaugsbakk@fastmail.com \
--cc=abieniek@antmicro.com \
--cc=ar2rekb@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.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