alphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 1 year agoHistory repeats itselflemmy.worldimagemessage-square33fedilinkarrow-up1418arrow-down111
arrow-up1407arrow-down1imageHistory repeats itselflemmy.worldalphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 1 year agomessage-square33fedilink
minus-squareatyaz@reddthat.comlinkfedilinkarrow-up2arrow-down1·1 year 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-squareyogo@lemm.eelinkfedilinkarrow-up1·1 year 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