From: Kristoffer Haugsbakk Date: Thu, 20 Aug 2026 17:29:08 GMT Subject: Re: [PATCH] pull: add --hard mode Message-ID: 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. > ...