alphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 2 年前History repeats itselflemmy.worldimagemessage-square35linkfedilinkarrow-up1486arrow-down113
arrow-up1473arrow-down1imageHistory repeats itselflemmy.worldalphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 2 年前message-square35linkfedilink
minus-squareatyaz@reddthat.comlinkfedilinkarrow-up2arrow-down1·2 年前“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-up2·2 年前Cherry 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