From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93012C4338F for ; Mon, 26 Jul 2021 10:40:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6FB5560234 for ; Mon, 26 Jul 2021 10:40:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232263AbhGZJ7h (ORCPT ); Mon, 26 Jul 2021 05:59:37 -0400 Received: from smtp.hosts.co.uk ([85.233.160.19]:13590 "EHLO smtp.hosts.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231639AbhGZJ7d (ORCPT ); Mon, 26 Jul 2021 05:59:33 -0400 Received: from host-84-13-154-214.opaltelecom.net ([84.13.154.214] helo=[192.168.1.37]) by smtp.hosts.co.uk with esmtpa (Exim) (envelope-from ) id 1m7y1f-0003Gj-7j; Mon, 26 Jul 2021 11:39:59 +0100 Subject: Re: Files modified, even after: git reset --hard To: Martin , Chris Torek Cc: Git List References: <4e9b54b4-8e40-7fd3-ae65-d33390f3af43@mfriebe.de> <04f3b300-3ccf-c91b-6406-6a998b473a24@mfriebe.de> <070f7f5e-0e6c-2edc-1403-9265c810df17@mfriebe.de> From: Philip Oakley Message-ID: Date: Mon, 26 Jul 2021 11:39:59 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <070f7f5e-0e6c-2edc-1403-9265c810df17@mfriebe.de> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-GB Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 26/07/2021 02:34, Martin wrote: > I figured that is the reason why they show modified. > > Not a problem. Until I am in the middle of a rebase, and i cannot run > (after a conflict) >   git rebase --continue > > The modified files are not part of the original series of commits. > they are just random files from somewhere else in the tree. > I can not reset/restore them. > So I must now "git add" files entirely unrelated to continue rebasing. > Well or apparently change my config for the duration of the rebase. Is this 'mid-rebase' the core case for the 'Files modified' problem? - does it happen at other times (excepting maybe cherry-pick) i.e. you are rebasing a series of commits where some files had 'old' line endings in the repository, but your current line ending setting wants the line endings in those un-related, un-changed files to change their line endings, and the rebase command can't cope with these incidental differences? Philip