Am 12.06.19 um 17:03 schrieb Shawn Landden: > If a patch has been applied upstream AND THEN reverted, rebase still > drops the patch, requiring the use of relative rebase git rebase -i > HEAD~5 et cetera. > > git rebase should detect reverts as well. You have the same patch that upstream has. Perhaps you cherry-picked it from them, or they cherry-picked it from you. In any case, they thought the patch was a good one. Later upstream found a problem with the patch and decided to revert it. Certainly, they didn't do this just for fun; they had a good reason. Now you are rebasing against upstream. IOW, you are accepting the authority of the upstream code. Then, why on earth would you not want to accept their authorative word that the cherry-picked patch was bad and needed to be reverted? If you later find out that your patch is definitely needed, then it is on you to prove that, for example, by including it again in your patch series. That must be an explicit decision on your part, not an accident that happens. TLDR: Git worked as designed. -- Hannes
