From: Philip Oakley <philipoakley@iee.email>
To: Martin <git@mfriebe.de>, Chris Torek <chris.torek@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: Files modified, even after: git reset --hard
Date: Mon, 26 Jul 2021 11:39:59 +0100 [thread overview]
Message-ID: <fd2f2e6b-0ced-8eb7-b908-956b084f23c7@iee.email> (raw)
In-Reply-To: <070f7f5e-0e6c-2edc-1403-9265c810df17@mfriebe.de>
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
next prev parent reply other threads:[~2021-07-26 10:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-25 15:04 Files modified, even after: git reset --hard Martin
2021-07-25 15:40 ` Martin
2021-07-25 17:48 ` Martin
2021-07-25 18:39 ` Martin
2021-07-26 0:33 ` Chris Torek
2021-07-26 1:34 ` Martin
2021-07-26 2:59 ` Chris Torek
2021-07-26 10:31 ` Martin
2021-07-26 11:11 ` Chris Torek
2021-07-26 13:57 ` Martin
2021-07-26 18:21 ` Philip Oakley
2021-07-26 19:57 ` Martin
2021-07-26 22:03 ` Chris Torek
2021-07-27 0:55 ` Martin
2021-07-26 10:39 ` Philip Oakley [this message]
2021-07-26 12:50 ` Martin
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=fd2f2e6b-0ced-8eb7-b908-956b084f23c7@iee.email \
--to=philipoakley@iee.email \
--cc=chris.torek@gmail.com \
--cc=git@mfriebe.de \
--cc=git@vger.kernel.org \
/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).