Re: rebase drops patches that have since been reverted

2019-06-12 Thread Johannes Sixt
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. Per

rebase drops patches that have since been reverted

2019-06-12 Thread 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. -Shawn Landden