alphacyberranger to Programmer Humor@programming.devEnglish • 11 months agoHistory repeats itselflemmy.worldimagemessage-square35fedilinkarrow-up1486arrow-down113
arrow-up1473arrow-down1imageHistory repeats itselflemmy.worldalphacyberranger to Programmer Humor@programming.devEnglish • 11 months agomessage-square35fedilink
minus-square@atyaz@reddthat.comlinkfedilink1•11 months ago“Reapply” is rewriting it on the other branch. The branch you are rebasing to now has a one or multiple commits that do not represent real history. Only the very last commit on the branch is actually what the user rebasing has on their computer.
minus-square@yogo@lemm.eelinkfedilink2•11 months agoCherry picking also rewrites the commits. This is equivalent to rebasing: git branch -f orig_head git reset target git cherry-pick ..orig_head
“Reapply” is rewriting it on the other branch. The branch you are rebasing to now has a one or multiple commits that do not represent real history. Only the very last commit on the branch is actually what the user rebasing has on their computer.
Cherry picking also rewrites the commits. This is equivalent to rebasing:
git branch -f orig_head git reset target git cherry-pick ..orig_head