Re:PyPy has moved to Git, GitHub
by sampo on Monday January 01, 2024 @05:35PM
(#38835950)
> If I want to rebase B on the new A, well, those duplicated commits will cause me some amount of pain
Not really. Git will recognize commits that produce an identical diff and skip them. Your only pain will be that for each skipped commit, you will see a notification line in the output of your `git rebase`:
Re:PyPy has moved to Git, GitHub
by jcranmer on Monday January 01, 2024 @08:11PM
(#38836974)
If I had a nasty rebase of A, then git isn't smart enough to figure out that the new A' commits are similar enough to the old commits to know to skip the old-A commits.
Not really. Git will recognize commits that produce an identical diff and skip them. Your only pain will be that for each skipped commit, you will see a notification line in the output of your `git rebase`: