I have a project that contains traces to another project of myself that I\'ve used as a kind of a template project. Now I want to remove these traces entirely from the repositor
I know that's an old question, but I landed here today searching about this topic...
For the large amount of commits problem, you can try using "-X theirs" or "-X ours" in the rebase command, i.e.
git rebase -X theirs -i HEAD~20
the difference between the two it's explained here
I hope that can be useful to someone