On Thu, Feb 06, 2025 at 02:40:06PM +0100, Josef Wolf wrote: > foreach $commit original-branch-commits > git cherry-pick $commit I've done a lot of try and error with this approach and have come to the conclusion, that cherry-pick totally mis-behaves in the presence of clean/smudge filters. IMHO, content should never have any chance to bypass clean filter on its way to the repository. git-cherry-pick violates this and commits the smudged content, leading to problems which can be resolved only by using git add --renormalize . && git commit --amend --no-edit But even when git-cherry-pick starts on a normaalized commit, it tries to apply the picked commit without cleaning it before, so again conflits will be thrown. -- Josef Wolf jw@xxxxxxxxxxxxx
