alphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 2 years agoHistory repeats itselflemmy.worldimagemessage-square19fedilinkarrow-up18
arrow-up18imageHistory repeats itselflemmy.worldalphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 2 years agomessage-square19fedilink
minus-squareatyaz@reddthat.comlinkfedilinkarrow-up0·2 years 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·2 years 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