Re: A rebase regression in Git 2.18.0

Hi, Yes, it does fix this behavior. Could you please point me to the thread? Best, Nikolay > On 28. Aug 2018, at 15:33, Johannes Schindelin > wrote: > > Hi, > > On Tue, 28 Aug 2018, Ævar Arnfjörð Bjarmason wrote: > >> On Tue, Aug 28 2018, Nikolay Kasyanov wrote: &

A rebase regression in Git 2.18.0

EAD ..." to unstage) renamed:files/file3 -> nested/files/file3 Unmerged paths: (use "git reset HEAD ..." to unstage) (use "git add ..." to mark resolution) both modified: project Here’s a ready-to-use repository: https://github.com/nikolaykasyanov/git-rebase-bug. Regards, Nikolay Kasyanov