Almudena Garcia, le mar. 11 août 2020 14:17:17 +0200, a ecrit: > > You can use b (break) within a git rebase session to stop at some point. > > That way you can stop before the big change, commit part of it, and use > > git rebase --continue, and let git discover that part of the big change > > is already there and drop it from the big change. > > But I have tons of commits. Is there any simple way to only take the latest > version of each file and generate a set of commits for them?
Simplest might be to just do it by hand: git diff between master and your branch to get the complete patch, start a new branch from master, and apply the patch by pieces to make up proper commits, and finish with a diff between your old branch and your new branch, to check that you have everything in place. Samuel