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
